DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4126 commits 101 branches 268 tags 320 MiB
Commit graph

4126 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8c73a47afb Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed 2019-07-15 15:27:02 -07:00
snipe f82ffe378c Merge branch 'master' of https://github.com/snipe/snipe-it 2019-07-15 14:11:18 -07:00
snipe 984c2a8fd4 Better log message for bad LDAP connection 2019-07-15 14:10:57 -07:00
snipe 6736b1c4e7 Addresses #7238 - add PWA code to layout 
Needs additional UX testing
 2019-07-15 13:49:56 -07:00
Ivan Nieto d409be6d43 Fix #6910: Add logic to manipulate the eloquent query. (#7006) 
* Added company_id to consumables_users table

* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users

* Remove a migration that tries to fix this problem, but is not longer necessary
 2019-07-15 13:02:44 -07:00
Thomas Misilo e1b33f3087 Spelling Correction (#7206) 
Fixed Spelling for the word reqrite, to be rewrite.
 2019-06-27 18:33:13 -07:00
snipe 740d5a6846 Downgrading rollbar for Laravel 5.5 2019-06-25 18:07:21 -07:00
snipe d19df4ded8 Bumped version 2019-06-24 14:43:44 -07:00
Kasey 03a4512406 fixing previous commit's actual wiping of password (#7183) 
replaced Input::fille('ldap_pword') with _filled_.   Should be good to go.  

https://github.com/snipe/snipe-it/issues/7179

https://github.com/snipe/snipe-it/issues/7169
 2019-06-19 14:21:53 -07:00
snipe de992e4df3 Fixed LDAP password blanking on save 2019-06-14 17:20:37 -07:00
snipe a85251aa83 Fixed #7164 - change table name to permission_groups 2019-06-14 10:37:20 -07:00
snipe 26a1181765 Possible fix for reporting/admin migration back in time 2019-06-12 18:53:53 -07:00
snipe cef030cf55 Fixed permission insert 
//TODO

Handle this via model
 2019-06-12 18:39:55 -07:00
snipe 2bfa05fd2d Back in time fix FOR #7145 for new installs on MySQL 8+ 2019-06-12 16:24:55 -07:00
snipe 30904dd019 Reduce minimum group name length to 2 (from 3) 
eg: IT
 2019-06-12 15:56:19 -07:00
snipe 1d0d25db37 Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility 2019-06-12 15:51:47 -07:00
snipe cbff66c9db Improved error checking in locations importer 2019-06-10 18:50:41 -07:00
snipe 27231d49ea Small fixes for phpleague CSB reader v9 2019-06-03 22:05:16 -07:00
snipe 765417c0be Bumped point version 2019-05-31 14:17:26 -07:00
snipe 49a255c8fb Changed has to filled to fix bulk asset editing 2019-05-31 14:11:43 -07:00
snipe 925d3a23c6 Bumped hash 2019-05-31 13:11:07 -07:00
snipe 6966c132d0 Update language strings 2019-05-31 12:17:09 -07:00
snipe c29ab90029 Added Filipino, corrected order for Spanish variations 2019-05-31 11:58:14 -07:00
snipe d2bbc09892 Increased throttle to 120 requests per minute 2019-05-31 11:57:57 -07:00
snipe 74a2c29bc2 Fixed #7100 - Check if $user isset on checkin 2019-05-30 19:06:30 -07:00
snipe 2c64739e8f Removed old comments 2019-05-30 19:02:20 -07:00
snipe 37f950ab42 Fixed #7099 - set email to null by default for backup notifications 2019-05-29 19:09:37 -07:00
snipe b07a254e60 Bumped version 2019-05-29 15:51:54 -07:00
snipe 087cdd859e Fixed #7092 - handle weird port forwarding/port numbers for baseUrl 2019-05-29 14:57:58 -07:00
snipe 829d44bd27 Fixed #7098 - updated backup config for deleteFile() method 2019-05-29 14:47:55 -07:00
snipe db76090e10 Missed one 2019-05-28 19:12:53 -07:00
snipe 03cf3b5431 Bumped release again :( 2019-05-28 19:12:42 -07:00
snipe 40f101d471 Merge branch 'master' of https://github.com/snipe/snipe-it 2019-05-28 19:08:39 -07:00
snipe 7aa6ef5f6c Bumped version 2019-05-28 19:08:35 -07:00
Kasey 186b94751d Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084) 
* bump up to php7.1

& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`

* AND modapache ><

* 2 updates required to get software-properties+ppa
 2019-05-28 16:58:32 -07:00
snipe 6f2717a876 Updated branch in version file 2019-05-28 13:22:59 -07:00
snipe a014af4c47 Fixed #7083 - Removed user_exists constraint on department save 
If the user has been deleted, this prevented the department from being successfully saved on edit
 2019-05-28 13:18:31 -07:00
snipe 2dd31544fe Increased image size to 800px, added lightboxes 2019-05-24 19:11:08 -07:00
snipe 237acdcff0 Show accessory image on view page 2019-05-24 18:22:57 -07:00
snipe 5db7a7c196 More Atlassian clarifications 2019-05-24 18:10:19 -07:00
snipe 68acdff11b Added link to Atlassian plugin 2019-05-24 18:08:40 -07:00
snipe 58e72e5ee6 Derp - typo 2019-05-24 18:06:15 -07:00
snipe 6b43cd10ba Updated README 2019-05-24 18:05:28 -07:00
snipe b2c9a38db8 Fixed casing in sync command 2019-05-24 16:12:43 -07:00
snipe 6dcdb5abae Only display the file if the log record can be found 2019-05-24 16:06:52 -07:00
snipe 56576d9e45 Fixed more camel-casing -> snake-casing 2019-05-24 16:01:12 -07:00
snipe d5c3ee5ed0 Only try to get fieldset if model is valid 2019-05-24 15:44:54 -07:00
snipe 18db0a50f1 Only gtry to delete the file if a record is found in the log 2019-05-24 15:44:40 -07:00
snipe d596ced0a0 Fixed free_seats_count variable name 
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
 2019-05-24 15:44:18 -07:00
snipe 78fb2b2239 Only build the log upload destination path if there is a matching record 
Fixes [ch1232]
 2019-05-24 15:28:53 -07:00