Ivan Nieto Vivanco
|
50c008ead5
|
Adds check in condition that format custom dates
|
2022-06-14 01:37:15 -05:00 |
|
snipe
|
dd9c9520fb
|
Correctly filter by category_id
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:42:21 -07:00 |
|
snipe
|
92bb8fac32
|
Removed log statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 19:49:14 -07:00 |
|
snipe
|
20a0c4e3b5
|
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields
Fixes #8143 Date localization not working on custom fields
|
2022-06-13 19:47:20 -07:00 |
|
snipe
|
0153a37cd7
|
Merge pull request #11264 from snipe/fixes/set_default_ldap_version
Fixed default ldap version if not specified
|
2022-06-13 17:14:57 -07:00 |
|
snipe
|
4c11041477
|
Fixed regression: missing restore option for assets via API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-09 17:17:38 -07:00 |
|
Ivan Nieto Vivanco
|
f8718ffc1e
|
Fixes observer fails when creating and assigning asset
|
2022-06-09 18:08:04 -05:00 |
|
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 |
|
Ivan Nieto Vivanco
|
740f27198f
|
Evaluate if a custom field is a Date to present it with the correct format
|
2022-06-07 18:00:46 -05:00 |
|
snipe
|
5458676ead
|
Default to v3 of LDAP on settings save
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 21:00:22 -07:00 |
|
snipe
|
8337628323
|
Set elvis operator to ensure ldap version is 3 if null
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 20:57:18 -07:00 |
|
snipe
|
7faaa4ce24
|
Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed
Fixes log update action even if no changes are made to assets [sc-19131]
|
2022-06-06 20:06:19 -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 |
|
Ivan Nieto Vivanco
|
1030ad9a27
|
Early returns if no change is made in the Asset so the 'update' action doesn't log
|
2022-06-06 22:00:05 -05:00 |
|
snipe
|
8333c80b7a
|
Added address2 to column selector for locations listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 19:31:08 -07:00 |
|
Ivan Nieto Vivanco
|
f977c53ecb
|
Fixes some issues in the asset observer
|
2022-06-06 19:14:32 -05:00 |
|
snipe
|
7c77e03c5a
|
Initial rework of locations display
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 18:08:15 -07:00 |
|
snipe
|
133da6569b
|
Merge pull request #11252 from snipe/fixes/locations_improvements
Fixes/locations improvements
|
2022-06-05 17:05:25 -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 |
|
snipe
|
d31f185cce
|
Display the actual value
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:36:52 -07:00 |
|
snipe
|
5901182885
|
Removed stray character
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:30:34 -07:00 |
|
snipe
|
f033aeda83
|
Fixed typo in comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:28:00 -07:00 |
|
snipe
|
53f9e2bc7a
|
Wrap the Carbon method in a try/catch to prevent crashing on bad data
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:25:39 -07:00 |
|
snipe
|
910fc08406
|
Dropped log level to warn on SAML error
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-02 17:07:49 -07:00 |
|
Achmad Fienan Rahardianto
|
fe65de1207
|
implements cookie to maintain display preference
|
2022-06-01 11:54:05 +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 |
|
Brady Wetherington
|
8fdedf9441
|
Downgraded/Removed log statements
|
2022-05-24 19:30:22 -07:00 |
|
Ivan Nieto Vivanco
|
e0b64a4879
|
Fixes constraint violation when ordering some columns
|
2022-05-24 14:00:23 -05:00 |
|
Brady Wetherington
|
5130a86854
|
Google client-side TLS auth works better with null as context(?)
|
2022-05-23 20:31:43 -07:00 |
|
snipe
|
8333089278
|
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs
Accept asset/accessory improvements and fixes
|
2022-05-23 12:59:01 -07:00 |
|
snipe
|
70344cc02e
|
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow
Fixed #11129 - settings treeview won't stay active.
|
2022-05-23 12:55:11 -07:00 |
|
Godfrey M
|
160a147a58
|
removed line breaks and deadspace
|
2022-05-23 09:35:19 -07: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
|
afb3843fad
|
Added sig and filename to acceptedCheckout method
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
|
ebd3c11129
|
Added singleton
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
snipe
|
75acb0f28a
|
Added sig and eula pdf to checkout_acceptance
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
snipe
|
eb5f33e815
|
Removed logging statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
snipe
|
adbac82c30
|
Removed stored_eula_file from actionlog
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
snipe
|
e467ce912b
|
Added some debugging and comments
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
|
d0e8a4ca09
|
Added some comments for clarity
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 |
|
Ivan Nieto Vivanco
|
52901f50eb
|
Add date to checkout action when importing assets
|
2022-05-19 17:38:10 -05:00 |
|
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 |
|