DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14939 commits 97 branches 267 tags 296 MiB
Commit graph

14939 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 2002dfca17 Merge branch 'develop' 2017-12-26 17:13:49 -08:00
snipe 38c2ecbd0c Fixed migration use 2017-12-26 17:13:26 -08:00
snipe ce97faa8d4 Merge branch 'develop' 2017-12-26 17:11:40 -08:00
snipe 31ca4bff8c Break audit date denorm migrations into two separate migrations 2017-12-26 17:11:08 -08:00
snipe 6f9033b2fd Merge branch 'develop' 2017-12-26 16:49:42 -08:00
snipe 8864f81402 Fixed manufacturer error on printable user page 
Manufacturer is not required for accessories, so need to account for that
 2017-12-26 16:49:01 -08:00
snipe 71ba1af647 Fixed button class on asset view 2017-12-26 16:48:28 -08:00
snipe b894a4c19a Merge branch 'develop' 2017-12-20 12:36:45 -08:00
snipe c3a44f25fd Fixed #4663 - duplicate manufacturer name in selectlist 2017-12-20 12:32:55 -08:00
snipe 1f36e7997f Bumped version 2017-12-20 03:31:43 -08:00
snipe 33b5c26da5 Bumped hashcount 2017-12-19 22:16:31 -08:00
snipe e5a7e6619f Merge branch 'develop' 2017-12-19 22:15:51 -08:00
snipe d2e2c1c05f Stub and 404 registration routes 2017-12-19 22:14:51 -08:00
snipe 557b8b0ded Merge branch 'develop' 2017-12-19 20:57:46 -08:00
snipe 37d4cf3afb Fixed #4647 - requestable model button not clickable 2017-12-19 20:48:26 -08:00
snipe b716db225f Added “new” buttons for manufacturer and category in asset model creation 2017-12-19 20:30:46 -08:00
snipe fbe093705d Fixed #4640 - add username to user detail 2017-12-19 13:42:34 -08:00
snipe db278e9109 Merge branch 'develop' 2017-12-19 00:48:44 -08:00
snipe 88798435f6 Fixed inefficient query for inventory alerts 2017-12-19 00:32:39 -08:00
snipe 6220f0d8a5 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-15 18:57:21 -08:00
snipe 30716b349b Bumped dev hash 2017-12-15 18:55:56 -08:00
snipe 7a8c8233a2 Fixes #4639 2017-12-15 18:54:38 -08:00
snipe 7a2abcca33 Merge branch 'develop' 2017-12-14 13:00:46 -08:00
Ryan 9a40e5e651 return an error from ldap_search (#4623) 
This will return the error from the ldap_search ran in Models/Ldap.php instead of throwing an exception. Users seem to commonly be getting an Exception because of invalid search filters. This will better inform them of that issue without requiring them to enable DEBUG.
 2017-12-14 12:57:43 -08:00
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