DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
4086 commits 96 branches 267 tags 295 MiB
Commit graph

4086 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9fe2a7f81d Removed duplicate log entry on asset creation 2017-12-12 03:39:55 -08:00
snipe a988011f0c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-12 03:07:43 -08:00
snipe c816870083 De-norm last audit date so we can display it in the asset listing 2017-12-12 03:03:43 -08:00
snipe c5c46b7283 Removed duplicate deleted logaction 
This is handled via observers now
 2017-12-12 02:32:45 -08:00
snipe 8bb8306f80 Added restored string 2017-12-12 02:31:46 -08:00
snipe d91e8bfee5 Fixed select2 on setup 2017-12-12 02:31:36 -08:00
snipe 2b3e5c8800 Moved “deleted” alert banner higher on page 2017-12-12 02:31:26 -08:00
snipe 5b00a8ae33 Use specific company_id column name in user search 2017-12-11 22:50:55 -08:00
snipe 5ee6e7f94b Fixed #4613 - Added table prefix to user search DB raw 2017-12-11 22:31:07 -08:00
snipe f90271dae5 Aaaaand one more for #2810. Sigh. 2017-12-08 14:33:12 -08:00
snipe e1423bd9d9 One more fix for #2810 2017-12-08 14:02:27 -08:00
snipe 557714e7b7 Fixed #2810 - checkin fix for licenses 2017-12-08 13:19:10 -08:00
snipe 3df62a200f Fixed manufacturer gates 2017-12-08 13:16:37 -08:00
snipe a65ea639ed Added comments to SnipePermissionsPolicy for clarity 2017-12-07 21:00:09 -08:00
snipe defed52caa Fixed #4596 - manufacturer gate 2017-12-07 20:59:55 -08:00
snipe 035f7a5292 Formatted version 2017-12-07 19:24:03 -08:00
snipe 0ea3100896 Bumped hash 2017-12-07 19:23:34 -08:00
snipe 2e0c2bd190 Add @Gelob as a contributor 2017-12-07 19:20:08 -08:00
snipe ceca76b344 Merge branch 'develop' 2017-12-07 13:21:45 -08:00
snipe a062769672 Check for array key before checking selected state 
This is necessary for pre-created groups that don’t have all keys present
 2017-12-07 13:21:30 -08:00
Ryan af6a794ae9 fix typo (#4585) 2017-12-06 20:51:37 -08:00
snipe f4ac087c83 Fixed policy namespace 2017-12-06 14:49:52 -08:00
snipe 4898dd8e23 Use ImageUploadRequest $request on user profile update 2017-12-06 14:42:14 -08:00
snipe a090b6a9d2 Use ImageUploadRequest 2017-12-06 14:38:01 -08:00
snipe 023910472c Fixes #2415 - only allow gif, png jpg, svg image uploads 2017-12-06 14:33:52 -08:00
snipe 25bf10b125 Merge branch 'develop' 2017-12-06 11:19:45 -08:00
snipe dfb0c09c51 Fixed #4581 - renamed print method 2017-12-06 11:17:42 -08:00
snipe 41c8d6302a Merge branch 'develop' 2017-12-05 18:17:32 -08:00
snipe 83547e3fed Prepopulate ther groups array on create 2017-12-05 18:17:11 -08:00
snipe 0d92ffc7ed Merge branch 'develop' 2017-12-05 18:13:08 -08:00
snipe 3d0525bc51 Removed debugging info 2017-12-05 18:11:59 -08:00
snipe 808cd0f728 Nicer groups permission edit UI 2017-12-05 18:11:06 -08:00
snipe f5b3df697c Better select/unselect all javascript for permissions 2017-12-05 18:10:35 -08:00
snipe 29a36b5d1c Do not allow null id on group edit 2017-12-05 16:49:26 -08:00
snipe ec131a7416 Updated account licenses 2017-12-05 16:27:02 -08:00
snipe 3da49ceb60 Standardize hidden key format 2017-12-05 16:26:39 -08:00
snipe a19cef07bf Check for gate on license key display 2017-12-05 16:26:23 -08:00
snipe c39e6d7006 Fixed #4576 - licence checkout gate 2017-12-05 15:04:10 -08:00
snipe 60f6895919 Remove version from asset table to persist column selections 2017-12-05 14:50:38 -08:00
snipe bfa4812482 Exclude company on filter 2017-12-05 14:23:46 -08:00
snipe a083cdba18 Merge branch 'develop' 2017-12-05 14:04:55 -08:00
snipe 438f484d68 Removed duplicate purchase cost column 2017-12-05 14:03:08 -08:00
snipe f95d780fcf Include purchase cost column if depreciation is selected 2017-12-05 14:02:43 -08:00
snipe 79fe092c81 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-05 13:20:39 -08:00
snipe 027f6a7c12 Bumped hash 2017-12-05 13:18:52 -08:00
snipe 76fe2af0af Fixed #4444 - Added EOL back into asset lsiting and custom report 2017-12-05 13:03:11 -08:00
snipe e490185533 Fixed EOL in custom report 2017-12-05 12:54:19 -08:00
snipe deba4d2b81 Added consumables tio printable output 2017-12-05 12:37:42 -08:00
snipe a8cc29f062 Added #2562 - print view of all assigned inventory 2017-12-05 12:34:16 -08:00
snipe c9e6a75ea8 Make sure there is a valid status label associated withthe asset when checking if deployable 2017-12-05 11:28:48 -08:00