DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 00:07:42 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
3365 commits 89 branches 265 tags 290 MiB
Commit graph

3365 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 893bcd0533 Merge branch 'develop' 2017-12-12 21:14:41 -08:00
snipe f1a911d305 Fixed ambiguous query on non-super admins with FCS 2017-12-12 21:14:12 -08:00
snipe 8e8d9118e9 Merge branch 'develop' 2017-12-12 16:35:45 -08:00
snipe 9c108873e9 Trying 5.4.35 2017-12-12 16:32:45 -08:00
snipe 6fe5d00e9b Testing laravel 5.4.3 for PHP7.2 bug 2017-12-12 16:23:30 -08:00
snipe a85d5cfe92 Merge branch 'develop' 2017-12-12 12:58:52 -08:00
snipe 6b257cc287 Concat search for full name 2017-12-12 12:52:10 -08:00
snipe 2952497a60 Removed bower components directory 
We use npm/webpack now
 2017-12-12 11:42:26 -08:00
snipe 9018af4f1d Bumped hash 2017-12-12 10:45:20 -08:00
snipe 5204e84703 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-12 09:25:45 -08:00
snipe 55eaea0110 Derp. 2017-12-12 09:25:06 -08:00
snipe 671a125c62 Bumped hash 2017-12-12 09:24:40 -08:00
snipe eb827cdbe6 Merge branch 'develop' 2017-12-12 09:21:17 -08:00
snipe 5504dd435f Updated transslations 2017-12-12 09:20:57 -08:00
snipe 608bb1b5b1 Fixed #3416 - bulk delete asset models 2017-12-12 09:10:05 -08:00
snipe 88b64034e8 Fixed #3416 - bulk delete asset models 2017-12-12 09:03:37 -08:00
snipe 694c6f3ec6 Merge branch 'develop' 2017-12-12 07:22:30 -08:00
snipe 1d82f80e73 Improved - used “checked out to” string in asset model listing to reflect new polymorphic options 2017-12-12 07:20:06 -08:00
snipe e21fa37254 Added - bulk actions to model asset listings 2017-12-12 07:15:51 -08:00
snipe 1ef44721f5 Improved - disallow delete if not elgible in UI 2017-12-12 07:03:31 -08:00
snipe 528630a8d3 Improvement - make asset, etc totals in company listing sortable 2017-12-12 07:03:09 -08:00
snipe 856a760d89 Improved - disallow deleting manufactureres if there are associated items 
This is enforced on the backend - UI imorovement only
 2017-12-12 06:52:50 -08:00
snipe 9179b6d9c4 Improved - disallow delete through the GUI if asset model has assets associated 
(We prevent this on the backend anyway, but this makes for nicer UI)
 2017-12-12 06:49:04 -08:00
snipe 4ce91a4f5d Fixed namespace gate for components - related to #4282 2017-12-12 06:26:37 -08:00
snipe aff93d8f2b Fixed #4589 - Licence deployed to asset issue 2017-12-12 05:43:06 -08:00
snipe e4ab4024c5 Added - changelog searchable in history tab 2017-12-12 05:10:13 -08:00
snipe 612f23f6e0 Added #2893 - track changes on asset edits 2017-12-12 04:59:28 -08:00
snipe 1d543f83d4 Added line spacing between unstyled lists 2017-12-12 04:31:53 -08:00
snipe 88ca852dcf Cleaned up asset observer 2017-12-12 03:40:04 -08:00
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