5be7dee3d3
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 15:07:14 -07:00
72799973e7
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 14:41:44 -07:00
d8a8e03bf6
Nicer styling
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 14:39:01 -07:00
a243823e5e
Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow
...
Adjust requested assets and models workflow a little bit.
2022-05-24 14:31:40 -07:00
a4cf601c98
Remove extra tag and other stylistic changes
2022-05-24 16:27:55 -05:00
1e3c0d597e
Use @can view directive instead of @if superadmin
2022-05-24 15:53:26 -05:00
91822d2e45
Use shorter helper config method
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 13:26:29 -07:00
08ff71aae3
Merge pull request #11192 from snipe/fixes/typo_on_maintenance_screen
...
Fixed typo on maintenance screen
2022-05-24 13:16:50 -07:00
5d83516659
Fixed typoe on maintenance screen
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 13:15:01 -07:00
0e6c82776a
Merge pull request #11191 from snipe/fixes/corrected_activated_language_in_bulk_edit
...
Updated language strings from activated to able to login
2022-05-24 13:13:02 -07:00
67616dbcf4
Updated language strings from activated to able to login
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 13:12:02 -07:00
4839985f38
Added forced space after admin/superadmin badge
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 12:59:36 -07:00
aa841a4674
Check permission before show links or not in requestable asset models view
2022-05-24 14:40:32 -05:00
6d1de73cad
Fixes some html structure in the requested assets view
2022-05-24 14:06:05 -05:00
e0b64a4879
Fixes constraint violation when ordering some columns
2022-05-24 14:00:23 -05:00
0a6626891e
Add links to requestable Models' name
2022-05-24 13:36:13 -05:00
810578ff5d
Merge pull request #11189 from snipe/fixes/show_username_on_user_view_if_not_admin
...
Fixed bug where username wasn’t showing for regular users
2022-05-24 10:48:55 -07:00
64eafb062e
Fixed bug where username wasn’t showing for regular users
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-24 10:48:02 -07:00
30583f920d
Merge pull request #11184 from uberbrady/fix_google_ldap_rebased
...
Google client-side TLS auth works better with null as context(?)
2022-05-23 20:35:15 -07:00
5130a86854
Google client-side TLS auth works better with null as context(?)
2022-05-23 20:31:43 -07:00
e34ea32a5e
Fixed translation styring reference
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-23 20:15:22 -07:00
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
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
4adb990a5d
removed line breaks and deadspace
2022-05-23 09:37:20 -07:00
160a147a58
removed line breaks and deadspace
2022-05-23 09:35:19 -07:00
bd384d3f10
Small formatting fixes
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
ad8143b0bd
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
f439970e7a
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
625f120813
Removed unused cases
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
a37a576ee5
FIxed translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
2bd0679a81
A few more tweaks to PDFs
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
b7eb72fe49
Rough refactor of the acceptance controller
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
afb3843fad
Added sig and filename to acceptedCheckout method
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
8e85d316c9
Removed stored_eula_file from API transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
ebd3c11129
Added singleton
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
75acb0f28a
Added sig and eula pdf to checkout_acceptance
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
eb5f33e815
Removed logging statement
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
8c64e7359a
Added signature column, removed stored_eula_file column
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
14495cd1da
Nicer PDF display
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
93eba43b76
Removed trailing slash from route
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
adbac82c30
Removed stored_eula_file from actionlog
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
e467ce912b
Added some debugging and comments
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
4eab5fd075
Removed older comments
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
d0e8a4ca09
Added some comments for clarity
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
bcd0671213
Migration to drop stored_eula_column
...
It’s extraneous, since we already have a file field in the action_logs, and we already store the stored_eula_file in checkout_acceptances.
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
266a9e5328
Removed stored_eula_file from controller
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-19 17:55:59 -07:00
a37fbe6abf
Merge pull request #11171 from inietov/fixes/checkout_date_missing_in_mail_when_importing_assets
...
Fixes Checkout date missing in asset delivery mail
2022-05-19 15:49:43 -07:00
52901f50eb
Add date to checkout action when importing assets
2022-05-19 17:38:10 -05:00
8706b6d8a9
Merge pull request #11167 from inietov/fixes/error_500_on_import_page
...
Fixes #9019 Import page returns error 500
2022-05-19 10:50:59 -07:00
5d29f77d60
Initialize result variable so return don't crash
2022-05-19 12:47:12 -05:00
