DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 08:17:48 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7767 commits 89 branches 265 tags 290 MiB
Commit graph

7767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 91c7a89f93 Change to use the date() function instead of Helper::getFormattedDateObject() 2022-05-17 16:24:52 -05:00
snipe 700b4ef058
Merge pull request #11127 from trav-c/bugfix/issue-11126-custom-css-encoding 
Fixed #11126: don't entitise custom CSS on the labels view
 2022-05-17 07:22:21 -07:00
Travers Carter 1fc0adf7b7 Fixed #11126: don't entitise custom CSS on the labels view 2022-05-18 00:16:18 +10:00
snipe 58875d5606 Added gitgnore to eula-pdfs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 04:28:18 -07:00
snipe 0dfc98a493 Force db:wipe 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 04:27:48 -07:00
snipe 15a1db480a
Merge pull request #11115 from snipe/fixes/update_constraints_to_php82 
Update constraints to allow up to 8.2
 2022-05-16 17:42:50 -07:00
snipe 3dc4f56fb4 Update constraints to allow up to 8.2 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 17:23:41 -07:00
snipe 7da8ec8448 Merge remote-tracking branch 'origin/develop' 2022-05-16 17:02:54 -07:00
snipe a973c0626e
Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups 
We inadvertently used the wrong label for one of the headers
 2022-05-16 17:02:31 -07:00
Brady Wetherington 213d990e47 We inadvertently used the wrong label for one of the headers on the backups page 2022-05-16 17:00:22 -07:00
snipe a5fbfdbab4 Merge remote-tracking branch 'origin/develop' 2022-05-16 16:51:46 -07:00
snipe b705878318
Merge pull request #11113 from snipe/fixes/11112_correct_formatter_for_locations 
Fixed #11112 - use correct formatter for locations on dashboard
 2022-05-16 16:51:22 -07:00
snipe 925529923a Fixed #11112 - use correct formatter for locations on dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 16:50:47 -07:00
snipe 13ce7513f0 Merge remote-tracking branch 'origin/develop' 2022-05-16 15:59:54 -07:00
snipe 7a1b17ff6a Backslash log:: (we shouldn’t have to do this tho?) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:59:41 -07:00
snipe b32fba7f8a Switch to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:33:26 -07:00
snipe 7573a03cc5 Bumped minor version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 15:32:57 -07:00
snipe b2e7572fe0
Merge pull request #11111 from snipe/fixes/individual_pass_reset 
Fixed #11100 for individual users
 2022-05-16 12:08:08 -07:00
snipe d4f7b5f80c Fixed #11100 for individual users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 12:07:18 -07:00
snipe 64b582c657
Merge pull request #11108 from uberbrady/fix_ldap_first_login_password 
Pass the password along directly instead of retrieving it from the In…
 2022-05-16 11:01:35 -07:00
Brady Wetherington 6c86a28d18 Pass the password along directly instead of retrieving it from the Input or Request 2022-05-16 10:58:27 -07:00
snipe 63f8b0cad1
Merge pull request #11107 from uberbrady/fix_bulk_user_reset_passwords 
Fixed #11104 - bulk-user reset-password links returning 500
 2022-05-16 10:41:37 -07:00
Brady Wetherington b05d85ab0a Fix bulk-user reset-password links 2022-05-16 10:38:12 -07:00
snipe 93e509bd79
Merge pull request #11105 from snipe/fixes/upgrade_dom_pdf 
Upgraded dompdf
 2022-05-16 10:18:37 -07:00
snipe 4c06a451b8 Upgraded dompdf 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 10:17:46 -07:00
snipe 1c32dcae9f Add login note to demo resetter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-15 10:20:03 -07:00
snipe 33c3a5a8ca
Merge pull request #11088 from uberbrady/fix_ldap_manager_sync 
Only set manager ID when the lookup succeeds.
 2022-05-15 09:45:04 -07:00
Brady Wetherington f608e4586c Only set manager ID when the lookup succeeds. 2022-05-15 09:25:28 -07:00
snipe a050be873b
Merge pull request #11080 from snipe/fixes/remove_sr_only_for_backup_file 
Removed sr-only class for now - not sure why it’s interfering with the upload button
 2022-05-14 11:02:55 -07:00
snipe ed8e82a606 Removed sr-only class for now - not sure why it’s interfering with the submit button JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 11:02:02 -07:00
snipe 8eed01bfa4
Merge pull request #11078 from snipe/fixes/show_encrypted_on_custom_field_view 
Adds encrypted status to custom fields overview
 2022-05-14 10:25:45 -07:00
snipe 418131df69
Merge pull request #11079 from snipe/fixes/adds_missing_backups_help_string 
Fixed missing backups help string
 2022-05-14 10:25:33 -07:00
snipe 5030c7e5ff Added missing backups help string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:24:03 -07:00
snipe 91fb27ee00 Adds encrypted status to custom fields overview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:20:04 -07:00
snipe 5f1f6baee9 Fixed unrelated typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:19:12 -07:00
snipe cc35a9ab6b
Merge pull request #11077 from snipe/fixes/11075_wrong_var_for_licenses 
Fix route for people file deletion
 2022-05-14 08:26:29 -07:00
snipe 3fe0e04d52 Fix roite for people file deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 08:25:22 -07:00
snipe d904fb1d80
Merge pull request #11076 from johnson-yi/fixes/saml_slo 
Fixes #10706 - Fix saml slo for logout
 2022-05-14 08:10:50 -07:00
Johnson Yi 4401dab8d6 fix saml slo for logout 2022-05-14 11:59:34 +00:00
snipe c4d75dca68
Merge pull request #11073 from snipe/features/add_filesize_to_object_uploads 
Fixed #11052 - add file sizes to upload displays
 2022-05-13 19:39:07 -07:00
snipe 3a31104b5c Fixed #11052 - add file sizes to upload displays 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 19:33:14 -07:00
snipe 3ff745937a
Merge pull request #11070 from snipe/fixes/11068_use_statement_for_login_attempts 
Added missing use statement
 2022-05-13 16:46:39 -07:00
snipe 333aa05809 Added missing use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 16:46:13 -07:00
snipe c5ec3efc70
Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields 
Fixed  #11014 - double encoding for custom fields
 2022-05-13 16:12:24 -07:00
snipe 747b58cb59 Bumped laravel version in readme 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 16:09:00 -07:00
snipe 8794936e1a
Merge pull request #11067 from uberbrady/master 
Fix cancel button in two-factor sign-in screen
 2022-05-13 14:56:00 -07:00
Brady Wetherington ec65f7c72a Merge remote-tracking branch 'upstream/master' 2022-05-13 14:50:08 -07:00
Brady Wetherington b6284e6651 Fix 'cancel' button in two-factor screen 2022-05-13 14:49:37 -07:00
snipe 5cc4f9bc2a
Merge pull request #11066 from uberbrady/fix_two_factor_v6 
Switch the barcode backend to SVG, and fix the two-factor middleware
 2022-05-13 14:38:15 -07:00
snipe d8a4509b22 Fix logout on 2fa 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 14:36:20 -07:00