lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
8311 commits 1 branch 0 tags 220 MiB
Commit graph

3472 commits

Author SHA1 Message Date
Ivan Nieto Vivanco
340c59969c Add query to update assigned assets location when importing users 2022-05-19 13:34:50 -05:00
Ivan Nieto Vivanco
5d29f77d60 Initialize result variable so return don't crash 2022-05-19 12:47:12 -05:00
snipe
4669bb54fe Small fixes for asset tag regeneration script 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 17:14:22 -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
Godfrey M
23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00
Godfrey M
cfc4c58da3 fixes the Settings Tree menu to remain active when opened 2022-05-18 13:06:06 -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
32111a863b Call User::generateFormattedNameFromFullName() in the UserImporter 2022-05-18 13:02:44 -05:00
snipe
b7b21689f2 Merge remote-tracking branch 'origin/develop' 2022-05-18 04:25:23 -07: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
snipe
71828d5461 One more trim…. sigh.. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:53:42 -07:00
snipe
d9817ec696 Added a trim 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:51:53 -07:00
snipe
33ded3f18a More debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:48:09 -07:00
snipe
004d567253 Added some debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:31:00 -07:00
Brady Wetherington
b4a0d33ba8 Reduce logging further; we know the main error condition now 2022-05-17 19:57:42 -07:00
Brady Wetherington
4e65a8d755 Reduce SAML debugging output to actual error conditions 2022-05-17 19:54:14 -07:00
snipe
11db243514
Merge pull request #11135 from uberbrady/improve_restore_erroring 
Do some better erroring if you can't launch the mysql binary
 2022-05-17 18:16:40 -07:00
Brady Wetherington
d391980b06 Do some better erroring if you can't launch the mysql binary 2022-05-17 17:01:23 -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
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
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
snipe
1c32dcae9f Add login note to demo resetter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-15 10:20:03 -07:00
Brady Wetherington
f608e4586c Only set manager ID when the lookup succeeds. 2022-05-15 09:25:28 -07:00
Johnson Yi
4401dab8d6 fix saml slo for logout 2022-05-14 11:59:34 +00: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
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
deb2d958d8 Sets maxlength of user fields to 191 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 04:54:12 -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
446e44deb6
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative 
Fixed validation for purchase cost allowed to be negative
 2022-05-10 17:36:01 -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
Godfrey M
2c1f368828 adds validation for all purchase costs variables 2022-05-10 16:26:06 -07:00
Godfrey M
33b1ab3658 prevents values for assets being negative through validation 2022-05-10 16:19:06 -07:00
snipe
f4650c65db Clearer phrasing for log 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 13:00:48 -07:00
snipe
d3830a44d8 Added more verbose messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:40:50 -07:00
snipe
5869b6ed0c And still more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-10 12:38:46 -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