DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
5383 commits 89 branches 265 tags 290 MiB
Commit graph

5383 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 870b097f03 Derp. Should be master 2020-10-19 17:49:56 -07:00
snipe 3e2996a46a Merge remote-tracking branch 'origin/develop' 2020-10-19 16:57:24 -07:00
snipe 1090b291c3 Updated node packages, reregnerated assets 2020-10-19 16:56:59 -07:00
snipe 12ae408830 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	resources/views/auth/passwords/reset.blade.php
 2020-10-19 16:40:07 -07:00
snipe a62e8413ba Updated version 2020-10-19 16:36:25 -07:00
snipe c1443aa6eb Pull licenses, accessories, etc - the qty is not accurately reflected 2020-10-19 16:22:55 -07:00
snipe e80b63b5c1 Fixed #8526 - skip cache for setup check 2020-10-19 12:33:38 -07:00
Brady Wetherington 6b1f1a29ef
Merge pull request #8525 from uberbrady/fix_nonexistent_ldap_active_flag 
Ensure misdefined active flags will not prevent user syncing
 2020-10-19 10:56:40 -07:00
snipe 36436f7929 Nope - was right the first time. Sigh. 2020-10-15 19:17:08 -07:00
snipe 569905ad06 Fixed “down” migration 2020-10-15 19:15:33 -07:00
Brady Wetherington b626b7895a Ensure misdefined active flags will not prevent user syncing 2020-10-15 19:10:47 -07:00
snipe eebb463601
Merge pull request #8524 from snipe/fixes/8513_weird_oauth_table_migration_fsckery 
Fixed #8513 - Manually created oauth tables
 2020-10-15 18:27:36 -07:00
snipe 8f0b3ace92 Manuall created oauth tables 
We shouldn’t have to do this, but…
 2020-10-15 18:20:41 -07:00
snipe 2dc027e479 Bumped GM version 2020-10-09 17:29:31 -07:00
snipe 51d804c971 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-10-09 17:24:55 -07:00
snipe fa41b74856 Fixed parse error in Columbian spanish translation 2020-10-09 17:24:48 -07:00
snipe 701f35e063
Merge pull request #8508 from uberbrady/fix_ad_logins_v5 
[Discuss] Fix some logic bugs in the AD-specific code for logging in via AD/LDAP
 2020-10-09 17:15:55 -07:00
snipe a39069bc45 Small UI improvements to API keys page 2020-10-09 16:02:30 -07:00
Brady Wetherington be4aa07d8c Some logic bugs in the AD-specific code for logging in via AD/LDAP 2020-10-09 15:33:17 -07:00
snipe 714ad071ca Add API endpoint to API keys page 
// TODO - localize it
 2020-10-09 14:46:11 -07:00
snipe 0954ff0659 Fixed lost ldap password on save when nothing entered 2020-10-09 13:08:51 -07:00
snipe 33cf4896d8 Use password complexity rules on password reset 2020-10-08 19:28:21 -07:00
snipe c0f9a35dea Fixed password reset blade with correct username 2020-10-08 18:47:42 -07:00
snipe 8a1136d80a Use password security settings on password reset 2020-10-08 18:43:39 -07:00
snipe 292370b02f Cleaned up validation 2020-10-08 18:43:23 -07:00
snipe d7e58a35bf Revert "Updated translations" 
This reverts commit aad14b4d7a.
 2020-10-08 18:43:06 -07:00
snipe aad14b4d7a Updated translations 2020-10-06 19:30:04 -07:00
snipe 01a98c38dc Added welsh as an localization option 2020-10-06 19:16:29 -07:00
snipe 4dbf1f58e3 Bumped RC to GM 2020-10-06 19:11:34 -07:00
snipe f5116d4cb5
Merge pull request #8499 from uberbrady/fix_v5_AD_OU_handling 
Modify Snipe-IT v5 AD handling to use the same ldap_host as for LDAP
 2020-10-06 18:56:54 -07:00
Brady Wetherington b015cff8bd Modify Snipe-IT v5 AD handling to use the same ldap_host, and improve OU handling 2020-10-06 18:31:06 -07:00
snipe 0e632cc7fb
Merge pull request #8494 from snipe/features/nuke_barcodes 
Added utility to delete barcode cache from labels/barcodes setting
 2020-10-06 17:42:57 -07:00
snipe b49c5dbf06 Clarified language 2020-10-05 20:43:28 -07:00
snipe 6234c6e5fc Fixed typo 2020-10-05 20:35:27 -07:00
snipe 0cd19c87bf Added utility to delete barcode cache from labels/barcodes setting 2020-10-05 20:34:17 -07:00
snipe 14a10f60d9 Undo previous change (it was an intentional choice) 2020-09-29 15:24:50 -07:00
snipe 186e229190 Make date example reflect actual date 2020-09-28 19:01:58 -07:00
snipe dafac4ceb3 Disable ldap_enabled on demo, fixed some incorrect error messages 2020-09-25 19:04:38 -07:00
snipe 98b9ee9b25 Only save LDAP settings if not in demo mode 2020-09-25 18:38:26 -07:00
snipe 01548ba39d Add ad_append_domain to settings controller 2020-09-25 18:27:22 -07:00
snipe 695774a3fb Corrected throttle string 2020-09-24 23:39:32 -07:00
snipe 98246de4c7 Disable SAML on the demo 2020-09-24 19:25:28 -07:00
snipe da9896b59a Remove SAML settings on demo reset 2020-09-24 19:13:31 -07:00
snipe b0e9875a50 Counting is hard. :( 2020-09-24 14:20:29 -07:00
snipe 7314bc4c4e Bumped hash for newest RC 2020-09-24 14:19:34 -07:00
snipe ba70e07637
Merge pull request #8466 from benwa/gmaps-8465 
Changes Google Map to be a bit more detailed
 2020-09-22 17:59:45 -07:00
Bennett Blodinger 83dfa2a28c
Merge branch 'develop' into gmaps-8465 2020-09-22 17:41:38 -05:00
Blodinger 471e0fd2fc Changes the Google Maps window to be a bit more detailed 2020-09-22 14:30:38 -05:00
snipe 4bd140c324
Merge pull request #8451 from snipe/fixes/fix_ldap_js 
No longer toggle the 'disabled' attribute for ldap_server based on is_ad
 2020-09-17 14:14:23 -07:00
Brady Wetherington 0e823a962b Fix for #8424 - where the ldap_server setting was grayed out 2020-09-17 13:32:14 -07:00