Commit graph

10721 commits

Author SHA1 Message Date
snipe 1773f671da Ignore laravel backups dir 2016-05-12 16:20:39 -07:00
snipe b9b8149234 Minor backups fixes 2016-05-12 16:20:23 -07:00
snipe 720274446e Fixes #1997 - save user groups without Sentry crap 2016-05-12 15:26:48 -07:00
snipe 6d91774943 [Feature Request] Fixes #2030 - allow asset name change on checkin 2016-05-12 12:34:44 -07:00
snipe a96947efa9 Possible fix for #2037
via https://github.com/laravel/framework/issues/8565#issuecomment-151171239
2016-05-12 12:06:22 -07:00
snipe 062cbeb18f Fixed bug in categories asset listing for hardware 2016-05-12 10:39:19 -07:00
snipe ae8a03fec3 Add manufacturer name/sorting/searching on assets 2016-05-12 10:38:57 -07:00
snipe c41b47902e Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-09 15:41:05 -07:00
snipe c56c398d4c Fixes #1996 - replace old Sentry methods with laravel native 2016-05-09 15:40:27 -07:00
snipe a144fb77cd Fixed hodor 2016-05-09 15:38:29 -07:00
snipe 2222aeacac Merge pull request #2012 from snipe/v3_fix_ubuntu_version_in_docker
Pin down Ubuntu version for dockerfile in v3
2016-05-05 12:46:26 -07:00
Brady Wetherington a2ebc0d983 Pin down Ubuntu version for dockerfile in v3 2016-05-05 12:45:00 -07:00
snipe d40289fbc9 Fixes #1997 and #1996 - replace sentry functions 2016-04-28 21:59:43 -07:00
snipe ba01b20ad4 Use updated redirect() reference 2016-04-28 21:06:41 -07:00
snipe 8dd0e72284 Remove erroneous comment 2016-04-28 21:05:45 -07:00
snipe d927aa3273 Fix delete method for groups 2016-04-28 21:03:56 -07:00
snipe a0bff94de3 Moved selectedPermissionsArray 2016-04-28 20:57:07 -07:00
snipe 7d8af579cf Updated controller with correct helper namespace 2016-04-28 20:57:02 -07:00
snipe 7783471cc3 Move selectedPermissionsArray to helper, since it can be used by users as well 2016-04-28 20:56:47 -07:00
snipe 8dc0dc0a07 Update permissions for cli user tool 2016-04-28 20:56:27 -07:00
snipe e6cbafe5ff Suppress console warning 2016-04-28 20:19:31 -07:00
snipe 7b489ad1ec Ability to suppress users from checkoutable list 2016-04-28 20:19:22 -07:00
snipe 449163c875 Fixes #1995 - updated group admin to use native permissions 2016-04-28 14:03:54 -07:00
snipe 97a91e2d83 Fix setting namespace 2016-04-25 12:15:41 -07:00
snipe 898d9ad025 [Feature] Added Supplier and Assigned to in asset email alert
[Bugfix] Fixed escaping for email templates for L5.2
2016-04-23 04:04:03 -07:00
snipe b250e2b5f0 [Bugfix] Fixed escaping for email templates for L5.2 2016-04-23 04:03:26 -07:00
snipe 32c193b9bf [Bugfix] Fixed Mail namespace 2016-04-23 04:02:52 -07:00
snipe c3b7332e3b [Bugfix] Fixed Mail namespace 2016-04-23 04:02:40 -07:00
snipe 96911b9e57 Fixes #1944 - add manufacturer to model list 2016-04-23 03:34:49 -07:00
snipe 3eb09871cf Fixed model name 2016-04-23 03:12:39 -07:00
snipe 1b5ef695f2 Add custom fields to modals in create asset 2016-04-23 03:12:31 -07:00
snipe 97e218541b Fixes date sanity check in checkout 2016-04-23 02:36:21 -07:00
snipe 30c6657fc1 Fixes date selector box 2016-04-23 02:36:08 -07:00
snipe 7a65fe8f89 Only get fieldset rules if there if is a model selected 2016-04-23 02:35:31 -07:00
snipe 93e7715c28 Fixes dumb timestamp if the user manually removes date 2016-04-23 02:34:29 -07:00
snipe 895fbb76bf Nicer error message formatting 2016-04-23 02:34:08 -07:00
snipe 7e0ab645bf Removed junk text 2016-04-23 02:09:52 -07:00
snipe 4d4b4ffd36 Use new checkout/checkin method 2016-04-23 02:08:38 -07:00
snipe 466f660a63 Removed older commented out code 2016-04-23 02:08:18 -07:00
snipe aa13b24bbc Remove Parsefloat. Again. 2016-04-23 02:08:04 -07:00
snipe 8179fc2f90 Changed checkout method to be more generic, for checkin and checkout 2016-04-23 02:07:40 -07:00
snipe 66a5050143 Fixed field name on checkin form 2016-04-23 02:06:57 -07:00
snipe c9d285cf47 Fixed float for purchase_cost 2016-04-21 22:23:08 -07:00
snipe b02cb91ae6 Tighter form display (offset-2) 2016-04-21 22:15:09 -07:00
snipe c9252989a1 Added red highlight back to superadmins 2016-04-21 21:59:50 -07:00
snipe e72d61d896 Checkin and Delete button 2016-04-21 21:56:28 -07:00
snipe d009c66c8b Fixed bulk user delete display 2016-04-21 21:53:31 -07:00
snipe 4b6f657739 Nicer purge box design 2016-04-21 21:53:22 -07:00
snipe ed8c72b946 Checkin and Delete User string 2016-04-21 21:53:13 -07:00
snipe 44f7305e12 Fix restore assets 2016-04-21 21:01:57 -07:00