DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5530 commits 97 branches 266 tags 291 MiB
Commit graph

5530 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9e319e91d6 Merge remote-tracking branch 'origin/develop' 2020-11-09 23:56:33 -08:00
snipe 895a544d4c Fixed [ch15347] - added status in Depreciation Report 2020-11-09 23:56:16 -08:00
snipe 2aa9412565 Bumped version 
# Conflicts:
#	config/version.php
 2020-11-09 23:09:46 -08:00
snipe 35ab5c7df0 Bumped version 2020-11-09 23:09:10 -08:00
snipe 8a7cd87644 Merge remote-tracking branch 'origin/develop' 2020-11-09 23:05:40 -08:00
snipe 1cdf6f8263 Fixed #8673 - added category to accessories listing on Account > Assigned Assets 2020-11-09 23:05:19 -08:00
snipe b8ad930690 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:55:42 -08:00
snipe ec14a117b7 Display on the API token page the expiration in years 
TODO: Translate these strings
 2020-11-09 22:55:27 -08:00
snipe b7cc12a466 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:53:23 -08:00
snipe f4080a7aa9 Fixed created_at and expired_at order in API token screen 2020-11-09 22:53:07 -08:00
snipe 5abfbdd1d2 Allow API token expiration in years to be configured via env 2020-11-09 22:52:55 -08:00
snipe 31bbb2d035 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:43:41 -08:00
snipe 33dca84ec7 Show expiry and created at date on API token page 2020-11-09 22:43:27 -08:00
snipe 460485d843 Make API tokens expire in 20 years 
TODO: Make this configurable and report the expiration in the UI
 2020-11-09 22:33:43 -08:00
snipe b59269d5e2 Bumped version 2020-11-09 21:46:42 -08:00
snipe 118931b6fb Merge remote-tracking branch 'origin/develop' 2020-11-09 21:46:26 -08:00
snipe 8bbf8409b1 Bumped hash 2020-11-09 21:46:08 -08:00
snipe b2101a5188 Merge remote-tracking branch 'origin/develop' 2020-11-09 21:09:05 -08:00
snipe ede20523f2 Fixed #8680 - location image path 2020-11-09 21:08:19 -08:00
snipe 89d9b830a0 Updated PHP requirement 2020-11-09 21:05:41 -08:00
snipe d76eea53c4 Bumped hash 2020-11-09 19:45:27 -08:00
snipe 63a8535de1 Merge remote-tracking branch 'origin/develop' 2020-11-09 19:11:37 -08:00
snipe ef7434b7ac Updated template 2020-11-09 19:11:18 -08:00
snipe 148b375ec2 Make 600 a string for ini_set 2020-11-09 19:11:00 -08:00
snipe d49bc33b54 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-09 18:21:15 -08:00
snipe 5bff5cb8c0 Updated Crowdin file 2020-11-09 18:21:10 -08:00
snipe c8634d85f5
Merge pull request #8706 from uberbrady/fix_bootstrap_tables_empty_fields 
Potential fix for empty-page problem in Assets view
 2020-11-09 18:19:42 -08:00
Brady Wetherington a5423649f4 This is the smallest set of changes we can use to work around a change in functionality 
in Bootstrap Tables. This should remedy some of the issues we've been having with large
GET strings being sent to the back-end by the Assets system.
 2020-11-09 17:36:07 -08:00
snipe b026953190
Merge pull request #8688 from sanjay900/patch-1 
Fix AD Accounts with delegation disabled
 2020-11-09 16:13:13 -08:00
snipe 3c209b29b1 Merge remote-tracking branch 'origin/develop' 2020-11-09 15:09:05 -08:00
snipe c0fb87c7f9
Merge pull request #8702 from uberbrady/ldap_time_limit_sync 
Restore the LDAP_TIME_LIM .env var
 2020-11-09 15:08:17 -08:00
snipe 48c3d0fd19 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	resources/lang/es-VE/general.php
 2020-11-09 14:55:11 -08:00
snipe 67f60127be Updated translations with latest from CrowdIn 2020-11-09 14:52:11 -08:00
snipe 4a8a98a7d3 Fixed user test 2020-11-09 14:17:45 -08:00
snipe 4b8e9a962b Fixed Venezuelan translation file 2020-11-09 14:05:31 -08:00
Brady Wetherington 966179290b Restore the LDAP_TIME_LIM env var for ldap sync of very large directories 2020-11-09 11:11:42 -08:00
snipe 6618e88a9a Fixed spanish translation parse error 2020-11-06 10:19:32 -08:00
Sanjay Govind ab6d2987a4
Include documentation from @uberbrady 
Previously on v4 this was all documented, so i have copied that documentation across to v5
 2020-11-06 12:31:33 +13:00
Sanjay Govind 45c140814f
Fix AD Accounts with delegation disabled 2020-11-06 12:02:19 +13:00
snipe 467ff045aa Moved the BACKUP_ENV to new BACKUP block 2020-11-03 14:58:19 -08:00
snipe e0103a7fbd Fixed #8595 - Updated spatie settings 2020-11-03 14:50:02 -08:00
snipe 432263f09f
Merge pull request #8671 from mzack5020/patch-1 
Fixed #8624 #8312: Re-Added Accessories API
 2020-11-03 13:50:38 -08:00
Matthew Zackschewski 911841d188
Re-Added Accessories API 
#8312 #8624 Removed unnecessary duplicate licenses endpoint and re-added the user accessories endpoint which was left off.
 2020-11-03 16:40:43 -05:00
snipe e8fd2a7fe8 Merge remote-tracking branch 'origin/develop' 2020-11-03 13:07:31 -08:00
snipe df5972c4fa Fixed send creds checkbox in create user form 2020-11-03 13:07:15 -08:00
snipe 4d003ac97a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	config/version.php
 2020-11-03 11:49:34 -08:00
snipe 9f4a212b44 Bumped hash 2020-11-03 11:47:58 -08:00
snipe 12667f41b9 bumped hash 2020-11-03 11:47:13 -08:00
snipe a8390ce4bd Removed debugging 2020-11-03 11:45:19 -08:00
snipe cfc1e1366c Added new password complexity rules to forgot password 2020-11-03 11:42:42 -08:00