DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
5768 commits 95 branches 267 tags 294 MiB
Commit graph

5768 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe c93f4ef0d5 Merge remote-tracking branch 'origin/develop' 2020-10-23 19:50:56 -07:00
snipe 89e36dbc42
Merge pull request #8606 from uberbrady/fix_cant_manage_self 
Add a new custom validator for Users
 2020-10-23 19:16:11 -07:00
snipe d317052ede Updated CSS assets with green skin edits 2020-10-23 18:55:00 -07:00
snipe 8ee9e5e059 Fixed #8537 - wrong sorting on dashboard 2020-10-23 18:33:10 -07:00
snipe 2602e4d602 Exclude the config directory from backups 
Everything there is handled via .env anyway
 2020-10-23 18:21:32 -07:00
snipe f357d9fc90 Include audit settings text in settings overview so they get picked up by the filter box 2020-10-23 18:13:28 -07:00
Brady Wetherington 0eda53c484 Add a new custom validator for Users to prevent someone from managing themselves 2020-10-23 16:55:10 -07:00
snipe 79a4acae1a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-23 14:29:40 -07:00
snipe 91e0b26bbb Bumped version 2020-10-23 14:28:55 -07:00
snipe 5f82214703 Merge remote-tracking branch 'origin/develop' 2020-10-23 14:24:24 -07:00
Brady Wetherington d517e2fd61
Merge pull request #8594 from uberbrady/try_to_fix_ldap_oom 
Possible fix to #8563 - unset $ldapUsers to avoid OOM'ing
 2020-10-23 14:23:53 -07:00
snipe 28612d8b61 Merge remote-tracking branch 'origin/develop' 2020-10-23 14:23:46 -07:00
snipe 6ee3d0eb97
Merge pull request #8605 from snipe/fixes/legacy_location_id_equals_zero 
Fix for legacy location_id=0 issue that can cause failure to checkout/checkin
 2020-10-23 14:22:53 -07:00
snipe 7987a4eca4 Used consistent phrasing in query 2020-10-23 14:22:15 -07:00
snipe 2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes 
Fixes #8462 - move accessory notes into pivot table
 2020-10-23 14:19:51 -07:00
snipe be0e327221 Simplified the migration 2020-10-23 14:14:34 -07:00
snipe 9a1acced58 Fix for legacy location_id=0 issue 2020-10-23 14:00:04 -07:00
snipe d74df93c48 Merge remote-tracking branch 'origin/develop' 2020-10-23 12:10:13 -07:00
snipe b9a9949570 Use the form partial for avatars 2020-10-23 12:09:20 -07:00
snipe 4ccba5337a Added https://gravatar address to CSP 2020-10-23 12:09:03 -07:00
snipe 8aae2b46cd Merge remote-tracking branch 'origin/develop' 2020-10-23 11:56:10 -07:00
snipe d03d4deef9 Temp fix for #8561 - manager_id validation error 2020-10-23 11:55:53 -07:00
snipe 21ceea0aed Removed extra debugging 2020-10-23 08:19:04 -07:00
snipe 2219c9ccb5 Merge remote-tracking branch 'origin/develop' 2020-10-23 06:55:39 -07:00
snipe bf9e53fbe7 Updated markdown templates 2020-10-23 06:55:23 -07:00
snipe f68580b482 Make the email table wider 2020-10-23 06:55:04 -07:00
snipe aec2f2a249 Fixed #8576 - switch to HTML from markdown 
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
 2020-10-23 06:54:45 -07:00
snipe 831da2d6d1 New mail vendor files 2020-10-23 06:17:07 -07:00
snipe f2aebe5f9a Fixed #8558 - error on asset acceptance when no sig is required 2020-10-23 05:09:03 -07:00
snipe 40c0ba9a95 Merge remote-tracking branch 'origin/develop' 2020-10-23 04:46:44 -07:00
snipe f5a0726f98 Fixed #8597 - Added leading slash to notifications console commands 2020-10-23 04:46:26 -07:00
snipe 2263dae8f4 Fixed HTML 2020-10-23 04:07:55 -07:00
snipe f182ce1c89 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-10-23 01:12:54 -07:00
snipe c6dde67e86 Bumped version 2020-10-23 01:12:19 -07:00