DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
2440 commits 97 branches 266 tags 292 MiB
Commit graph

2440 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b846bb20c6 Merge branch 'develop' 2017-10-18 01:23:01 -07:00
snipe ab3f5f4f4d Bumped version 2017-10-18 01:21:50 -07:00
snipe ea63ced2bd Fixes table alias bug in complex queries for Laravel 2017-10-18 01:21:08 -07:00
snipe 6bd49bfb72 Fixes #4191 - user search 2017-10-18 01:20:50 -07:00
snipe b80d3ce50d Hopefully fixes #4218 2017-10-18 00:36:52 -07:00
snipe c069829b33 Fixes #906 - groups view 2017-10-17 21:43:57 -07:00
Geoff Young 665a113ed8 Update account history query (#4237) 
This will limit the action_log records displayed when a user is viewing
their own assets and history since both target_type and target_id must
be set for a where condition to be added to the history query.
 2017-10-17 20:39:49 -07:00
snipe aa7091d962 Fixes #4226 - adds log_max_files to app config and sample env 2017-10-17 20:04:07 -07:00
snipe ceff6a9617 Merge branch 'develop' 2017-10-17 19:27:31 -07:00
snipe c01850fc73 Corrected Italian to Irish in language selector 2017-10-17 19:19:46 -07:00
snipe 4c04dc7b84 Merge branch 'develop' 2017-10-17 18:55:49 -07:00
snipe c0103cd878 Bumped version 2017-10-17 18:55:30 -07:00
snipe 1f1d9d5461 Merge branch 'develop' 2017-10-17 18:53:21 -07:00
snipe c776fa4f7b Updated language strings 2017-10-17 18:52:20 -07:00
snipe dc91d10395 More possible fixes for #4210 2017-10-17 17:35:48 -07:00
snipe 4df10ad26c Merge branch 'develop' 2017-10-17 17:19:15 -07:00
snipe 668a88bc86 Add autocomplete=off to settings forms for #4210 2017-10-17 17:18:17 -07:00
snipe d6e0012818 Merge branch 'develop' 2017-10-17 17:05:38 -07:00
snipe 1d5fb52bfc Fix for LDAP where location ou is not null but blank 2017-10-17 16:59:50 -07:00
snipe 8efb02a0ee Merge branch 'develop' 2017-10-17 16:23:59 -07:00
snipe dea42db18b Reversed order of withTrashed for deleted asset QR codes 2017-10-17 16:21:50 -07:00
snipe 78d5d3947f Merge branch 'develop' 2017-10-17 16:18:14 -07:00
snipe a1f5e11517 Fix for broken QR code on deleted assets 2017-10-17 16:01:53 -07:00
snipe 99ad096a8a Added a space next to crowdin badge 2017-10-17 15:26:16 -07:00
snipe 65b4ffeed9 Higher res crowdin badge 2017-10-17 15:25:34 -07:00
snipe 0dac88816a Merge branch 'develop' of github.com:snipe/snipe-it into develop 
# Conflicts:
#	README.md
 2017-10-17 15:20:53 -07:00
snipe f7626404b7 Add @BlueHatbRit as a contributor 2017-10-17 15:18:27 -07:00
Elliot Blackburn 78f4b08398 Change zenhub markdown shield to higher res (#4235) 
The zenhub badge was fuzzy as it was a low resolution for retina display. It's now using a new shield which falls in line with some of the others (img.shield.io).
 2017-10-17 15:16:49 -07:00
snipe 160fd1c86a Added setting to let admin decide whether footer text should link back to site 2017-10-17 13:54:03 -07:00
snipe 6ce01487c5 Merge branch 'develop' 2017-10-17 13:31:43 -07:00
snipe b46cbac911 Fixes #4230 - adds model name and manufacturer to emails 2017-10-17 13:30:32 -07:00
snipe e9c3d6bfb7 Full text search fixes - addresses laravel bug :( 2017-10-17 12:48:18 -07:00
snipe 9e9a5b7a53 Changed checkin/checkout buttons to different colors for easier visibility 2017-10-17 11:32:09 -07:00
snipe e7fe91c9d4 Depreciation view 2017-10-17 11:20:05 -07:00
snipe 6d130326aa Merge branch 'develop' 2017-10-16 21:28:23 -07:00
snipe 02db0f9f9d Handle deleted assets in maintenance 2017-10-16 21:28:05 -07:00
snipe e0668b7507 Handle references to suppliers that have been deleted 2017-10-16 21:19:06 -07:00
snipe 1376f246dc Merge branch 'develop' 2017-10-16 20:38:19 -07:00
snipe 113c55d905 Hopefully fixes #4150 2017-10-16 20:34:31 -07:00
snipe 9cc25bcfd0 Hopefully fixes #4150 2017-10-16 20:34:22 -07:00
snipe 81d3f78263 Production assets 2017-10-16 20:12:42 -07:00
snipe 66596b0b09 Production assets 2017-10-16 20:12:22 -07:00
snipe 7455b1019a Hacky possible fix for subdir issues 2017-10-16 20:12:11 -07:00
snipe 37df934e97 Fixes #4220 - allow nullable for completion date 2017-10-16 18:32:48 -07:00
snipe 6517a95d45 Check if there are any custom fields before trying to loop through them 2017-10-16 15:29:19 -07:00
snipe 4b84a0c916 Tidying some of the LDAP UDN logic 2017-10-16 15:29:06 -07:00
snipe 0f0a61e477 Merge branch 'develop' 2017-10-16 10:10:29 -07:00
snipe f64382aa00 Nicer error display in LDAP tests 2017-10-16 10:10:11 -07:00
snipe 1743417ec9 Merge branch 'develop' 2017-10-16 09:38:26 -07:00
snipe c61bed52c8 Removed danger class 2017-10-16 09:38:09 -07:00