DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5544 commits 101 branches 268 tags 320 MiB
Commit graph

1674 commits

Author SHA1 Message Date
snipe 044dfe2620 Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard 2020-11-10 00:54:39 -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 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 a66a22ffb2 Updated passwordComplexityRulesSaving() signature so it isn’t nullable 2020-11-02 23:58:37 -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 0c2800c7dd Removed debugging line 2020-11-02 21:26:13 -08:00
snipe 63bb2de4d4 Derp. Check and make sure that setting is actually on 2020-11-02 20:13:54 -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 502322be4b Fixed v5 500 server error when requesting multiple [ch15345] 2020-11-02 16:08:38 -08: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 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 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 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 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 2219c9ccb5 Merge remote-tracking branch 'origin/develop' 2020-10-23 06:55:39 -07:00
snipe f2aebe5f9a Fixed #8558 - error on asset acceptance when no sig is required 2020-10-23 05:09:03 -07:00
snipe 88f03e6b55 Added last_checkout and notes from pivot for accessories 2020-10-23 00:44:26 -07:00
snipe c3e8f64064 Merge remote-tracking branch 'origin/develop' 2020-10-22 23:24:56 -07:00
snipe 68cfbaab2e Fixed signature issue on accepted assets - related to #8577 
I have no idea how this ever worked? We didn’t rename that fieldname recently.
 2020-10-22 23:20:55 -07:00
snipe 66ac5d05ad Started migration to normalize note 2020-10-22 23:18:14 -07:00
snipe 153f849ef7
Merge pull request #8581 from fashberg/iss8580 
Fixed #8580: ReportsController called method on NULL Object
 2020-10-22 13:00:08 -07:00
Folke Ashberg 377c92a290
update 2020-10-22 14:33:24 +02:00
Folke Ashberg 5824ac3b28
Fix for #8580 
Checking $asset->depreciation before calling $asset->depreciated_date()
 2020-10-22 14:22:42 +02:00
snipe ec9c69323a Merge remote-tracking branch 'origin/develop' 2020-10-21 13:58:58 -07:00
snipe 338106734a Fixed #8562 - manufacturer logo upload failing 2020-10-21 13:57:56 -07:00
snipe 81fcb4c7b3 Merge remote-tracking branch 'origin/develop' 2020-10-21 13:33:04 -07:00
snipe 5ae65d5329 Fixed #8566 - PDF files displaying as ascii instead of downloading 2020-10-21 13:32:46 -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 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 8a1136d80a Use password security settings on password reset 2020-10-08 18:43:39 -07:00
snipe 0cd19c87bf Added utility to delete barcode cache from labels/barcodes setting 2020-10-05 20:34:17 -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 ed3afd1e2e Removed debugging 2020-09-15 23:19:52 -07:00
snipe 7736f12eb4 Switch to Guzzle for the Slack test 2020-09-15 23:05:27 -07:00
Ivan Nieto 501d5680ea Fix [ch15188] 500 error 2020-09-15 03:51:10 -05:00
snipe 514e7ca072
Added boolean has_eula to categories 2020-09-11 16:05:42 -07:00
Brady Wetherington f3f7d714a6 Fix ldap test button for php 7.4 (suppressing errors) 2020-09-09 14:18:05 -07:00
snipe 10648de9af
Bulk Checkin and Delete also edit users [ch15107] 2020-09-04 16:02:25 -07:00
snipe 5f5b80acae
Added maintained and reassignable to license listing 2020-09-04 10:02:04 -07:00
snipe 69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller 2020-09-03 19:47:15 -07:00