DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
5852 commits 101 branches 268 tags 288 MiB
Commit graph

5852 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 44e5fec707 Fixed #8603 - Use correct CSS path for signature-pad.min.css 2020-11-03 10:01:55 -08:00
snipe f138d3b781 Fixed typo 2020-11-03 01:00:37 -08:00
snipe bbd7a752a0 Minor cleanup 2020-11-02 23:58:49 -08:00
snipe a66a22ffb2 Updated passwordComplexityRulesSaving() signature so it isn’t nullable 2020-11-02 23:58:37 -08:00
snipe b29f794b35 password.expire updated for forgotten password token expiration 2020-11-02 23:58:09 -08:00
snipe 410c99da17 Added signature-pad.min.css to the css directory - should possibly fix #8603 2020-11-02 23:57:39 -08:00
snipe c800662f0c Use username for forgotten password 
Since emails are not required to be unique
 2020-11-02 23:57:00 -08:00
snipe b828985151 Fixed strpos to !== FALSE in ProfileController for complexity eval 2020-11-02 22:28:56 -08:00
snipe e6f53a53bc Updated min requirement for passwords in lang files 2020-11-02 22:15:01 -08:00
snipe 0c2800c7dd Removed debugging line 2020-11-02 21:26:13 -08:00
snipe a8f9f5239c
Merge pull request #8662 from snipe/features/disallow_password_equal_to_username_etc 
Fixed #8661 - Added feature to disallow password equal to username, email, etc
 2020-11-02 21:09:31 -08:00
snipe 63bb2de4d4 Derp. Check and make sure that setting is actually on 2020-11-02 20:13:54 -08:00
snipe c4b2ef5660 Removed debugging code 2020-11-02 20:10:18 -08:00
snipe 296655542d Added comments 2020-11-02 20:07:39 -08:00
snipe a55694da2f Added validation to disallow password to be the same as username, email, etc 2020-11-02 20:03:26 -08:00
snipe 33bda9b6d1 Added blade option for same_pwd_as_user_fields 
Disallows password form value to be the same as username, email, first name or last name
 2020-11-02 17:47:25 -08:00
snipe 42347d0f0c Added validation language for same_pwd_as_user_fields 2020-11-02 17:46:30 -08:00
snipe 6554903aeb Removed “use slack” debugging code 2020-11-02 17:46:09 -08:00
snipe 502322be4b Fixed v5 500 server error when requesting multiple [ch15345] 2020-11-02 16:08:38 -08:00
snipe 72facffcbe Fixed demo settings value for support_footer 2020-10-26 15:09:02 -07:00
snipe 001bb3cbe2 Bumped version to “pre” 2020-10-26 15:04:22 -07:00
snipe f42bd3a144 Fixed #8613 - Added deleted_at to user API response, added all=true to include deleted and not-deleted in one call 2020-10-26 14:58:45 -07:00
snipe b9330cf6b1 Fixed #8613 - 500 error on deleted users API call 2020-10-26 14:55:18 -07:00
snipe 2844800caf Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-26 14:26:05 -07:00
snipe b7e8b9bad7 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-10-26 14:24:43 -07:00
snipe a7ecaa6ebc
Merge pull request #8619 from uberbrady/fix_ldap_paging 
Fixed #8563 - Clean up AdLdap2 integration to better handle paged result-sets
 2020-10-26 14:24:34 -07:00
snipe 7937258f6e Bumped version 2020-10-26 14:24:19 -07:00
Brady Wetherington cce0739bb7 Clean up AdLdap2 integration to better handle paged result-sets 2020-10-26 12:53:45 -07:00