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

2251 commits

Author SHA1 Message Date
Ivan Nieto Vivanco 0c3972d7b7 Add spaces to the code for consistency 2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco 4a0eb2b3f1 Add element type of customfield to API response 2022-06-09 12:57:20 -05:00
snipe 728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop 
Fixes Accessories total quantity shows a negative number for develop branch
 2022-06-08 10:53:57 -07:00
snipe e0102ddbf0 Fixes #11093 Return true/false for custom fields/fieldsets required in API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-06 20:03:20 -07:00
snipe dba06a3a9e Check for valid location before trying to print 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:56:15 -07:00
snipe 07b1062fb2 Better handle API calls to nonexistent users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-03 16:55:23 -07:00
Ivan Nieto Vivanco eb34cf7917 Evaluates if logo is uploaded before export PDF 2022-05-31 15:59:01 -05:00
Ivan Nieto Vivanco 37f9cca5ec Minor stylistic change 2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco e0050bc844 Don't let a license to be checked out to a non-existent target 2022-05-26 18:06:53 -05:00
Ivan Nieto Vivanco 1f6ab340a6 Give a more descriptive name to variable 2022-05-25 18:53:17 -05:00
Ivan Nieto Vivanco f208869aff Add column to show filenames in Activity Report if the log action is 'uploaded' 2022-05-25 18:50:32 -05:00
snipe bd384d3f10 Small formatting fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe ad8143b0bd Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 625f120813 Removed unused cases 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe b7eb72fe49 Rough refactor of the acceptance controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 8e85d316c9 Removed stored_eula_file from API transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 4eab5fd075 Removed older comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 266a9e5328 Removed stored_eula_file from controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe f609146c29 Corrected field name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:37:10 -07:00
snipe 891009dc67 Nicer formatting for buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:35:57 -07:00
snipe 014a32b050 Run migrations after restore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 14:12:17 -07:00
Ivan Nieto Vivanco 1453b36484 Add filter to only get Assets for the unaccepted assets report 2022-05-18 14:46:48 -05:00
Ivan Nieto Vivanco a771984619 Add an early return if for some reason the import record is not found 2022-05-18 06:15:46 -05:00
Brady Wetherington b4a0d33ba8 Reduce logging further; we know the main error condition now 2022-05-17 19:57:42 -07:00
snipe a8eb138ae0
Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect 
Fixes #11096 Backup created_at time is incorrect
 2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco 72493d54aa Show the date and time as the user select in their settings 2022-05-17 16:36:05 -05:00
Ivan Nieto Vivanco 91c7a89f93 Change to use the date() function instead of Helper::getFormattedDateObject() 2022-05-17 16:24:52 -05:00
snipe 11f540daaf Added debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 09:41:35 -07:00
snipe 0dfc98a493 Force db:wipe 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 04:27:48 -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
Brady Wetherington b05d85ab0a Fix bulk-user reset-password links 2022-05-16 10:38:12 -07:00
Johnson Yi 4401dab8d6 fix saml slo for logout 2022-05-14 11:59:34 +00: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
Brady Wetherington 0ddb0f2c81 Switch the barcode backend to SVG, and fix the two-factor middleware 2022-05-13 14:22:27 -07:00
snipe 6fc222a648 Fixed #11014 - Removed double escaping on custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:45:00 -07:00
snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/permissions.php
 2022-05-12 09:31:42 -07:00
snipe c52faaf23d Added checkout to permissions check 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-11 19:02:23 -07:00
snipe 780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
 2022-05-10 17:26:26 -07:00
snipe 4fccf4ddc4 Few more log lines 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:27:42 -07:00
snipe 646166b2b6 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:16:07 -07:00
snipe f4e737eaf3 More SAML debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:14:22 -07:00
snipe f572eaa421 Added debugging for SAML login 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:07:07 -07:00
snipe dfd4d54433 Fixed route name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 15:46:25 -07:00
snipe 220f94faee Check that the session key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 14:10:47 -07:00
snipe 22ec3c1398 Use error style instead of warn/info when nothing was selected 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:41:52 -07:00
snipe caf17d4f25 Fixed wrong variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:41:32 -07:00
snipe e1b24bb763 Added a comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:30:21 -07:00