DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4219 commits 96 branches 267 tags 296 MiB
Commit graph

4219 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 2afcfcc87c Set DB_SSL to false for config 2016-12-03 17:32:44 -08:00
snipe 1afef9416a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2016-12-03 17:15:02 -08:00
snipe 77685fd52b Bumped version 2016-12-03 17:13:09 -08:00
snipe f532abebd4 Updated translations 2016-12-03 17:10:05 -08:00
Brady Wetherington 6f9a82f4ea On a succesful LDAP user-creation, we should return the $user, not (#3008) 
just 'true'.
 2016-12-01 15:54:13 -08:00
snipe 4049143ebf Bumped version 2016-12-01 06:11:03 -08:00
snipe 4df53bdf8d Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
#	resources/views/account/view-assets.blade.php
 2016-12-01 06:10:50 -08:00
snipe d49a1ea304 More graceful error message if log doesn’t exist 2016-12-01 06:05:14 -08:00
snipe 521f4facd5 Bumped version 2016-12-01 05:56:24 -08:00
snipe b4653dfc15 Ignore npm log 2016-12-01 05:55:29 -08:00
snipe 659d9c10ca Bumped hash 2016-12-01 05:54:21 -08:00
snipe 2ab0594530 Prevent errors if company support conflict prevents viewing the item 2016-12-01 05:54:14 -08:00
snipe 8a81b29901 Fixed missing closing angle bracket 2016-12-01 05:53:20 -08:00
snipe 93d9a6e4bb Ignore npm log 2016-12-01 05:52:50 -08:00
snipe 99e79a02d6 Revert "Halp! Stuck in pre-commit loop hell. :(" 
This reverts commit 47c77fe042.
 2016-12-01 03:08:14 -08:00
snipe 47c77fe042 Halp! Stuck in pre-commit loop hell. :( 2016-12-01 03:07:47 -08:00
snipe e42da293ee Updated version for pre-release 2016-12-01 03:07:21 -08:00
snipe a2ffe77d55 Automatically updated version hash 2016-12-01 03:07:12 -08:00
snipe a7a9f027fb Automatically updated version hash 2016-12-01 03:00:18 -08:00
snipe e587b2dcee Automatically updated version hash 2016-12-01 03:00:02 -08:00
snipe c3b4342df4 Automatically updated version hash 2016-12-01 02:59:17 -08:00
snipe 5a7ea0e908 Updated hash 2016-12-01 02:59:11 -08:00
snipe 59617cc7d3 Updated version in settings 2016-12-01 02:57:47 -08:00
snipe 1be22cf051 Improved versioning script 2016-12-01 02:53:41 -08:00
snipe e62f3f9fb4 Bumped hash 2016-12-01 02:27:12 -08:00
snipe 7ccef51a4f Removed some dumb comments 2016-12-01 02:25:53 -08:00
snipe 4c418bf622 Remove unused $request variable 2016-12-01 02:13:00 -08:00
snipe 16cfdbaa93 Redirect the lost password success back to login 2016-12-01 02:04:43 -08:00
snipe 3f8f6ad981 Fixes #2995 - adds max login attempts/duration as .env option 2016-12-01 02:04:15 -08:00
snipe d8d800bb7a Fixes #2997 - don’t include soft-deleted maintenances 2016-12-01 00:55:00 -08:00
snipe 5bca1ed2b6 Allow supression of debug warning for demo 2016-12-01 00:48:43 -08:00
snipe 68b9ffb908 Only allow login via LDAP if the user was already imported or created via LDAP 2016-12-01 00:29:45 -08:00
snipe d03c167d3b Switch string to product key 2016-12-01 00:15:48 -08:00
snipe 2ec7c0bf1d Hide edit actions from asset sidebar if user cannot edit assets 2016-12-01 00:00:48 -08:00
snipe 7513c99dd0 Fixed supplier string in hardware view 2016-11-30 23:19:13 -08:00
snipe 6c366eb112 Fixes potential login issue if password syncing is set to true 2016-11-30 20:39:43 -08:00
snipe 820d37cabb Custom logging to only show debug info if the app is in debug mode 
or if the user has overridden the APP_LOG_LEVEL in their env
 2016-11-30 20:38:46 -08:00
snipe b614470b21 Updated serial text to product key 2016-11-29 21:45:49 -08:00
snipe ce056c39e5 Removed requirement for serial number 
Some folks will use a license file instead
 2016-11-29 14:06:33 -08:00
snipe b6ffb8b3df Protect edit route as well 2016-11-29 13:40:00 -08:00
snipe f5e100a6a5 Only allow asset files to be deleted, maintenances to be added if user has assets.edit permission 2016-11-29 13:37:45 -08:00
snipe abcc01f5e0 More language string corrections 2016-11-29 12:48:00 -08:00
snipe 4dbe8fad30 More language string fixes 2016-11-29 08:46:33 -08:00
snipe 7bf1664b8f Allow XML mimetypes 2016-11-29 08:01:08 -08:00
snipe 92ace8582d Fixed notes column header language string 2016-11-29 07:57:02 -08:00
snipe 507040976a Fixed incorrect license field text strings 2016-11-29 07:52:00 -08:00
snipe b0d8711002 Add .lic as possible license file type 2016-11-29 07:22:45 -08:00
snipe 227ac94aa2 Bumped version hash 2016-11-29 06:21:37 -08:00
snipe 53404f3d1c Fixes asset model clone 2016-11-29 06:16:52 -08:00
snipe f605821143 Remove unneeded use statements 2016-11-29 06:14:33 -08:00