snipe
063893c109
Added new JS data attributes for assets in manufacturers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-08 04:18:05 -07:00
Ivan Nieto Vivanco
44f4f20187
Only fix typo in 'en' file
2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco
792b18f845
Return language files to previous state
2022-06-07 19:09:03 -05:00
Ivan Nieto Vivanco
d2fc27e21d
Add formatted date to EOL field in asset detailed view
2022-06-07 18:22:09 -05: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
Ivan Nieto Vivanco
064f4b3fc6
Fix typo in language files
2022-06-07 16:30:18 -05:00
Godfrey M
8c1843b351
updates colors in light color modes
2022-06-06 11:40:57 -07:00
snipe
c9e86ac194
Merge remote-tracking branch 'origin/develop'
2022-06-06 10:23:37 -07:00
snipe
f7449921e9
Merge pull request #11253 from snipe/features/nicer_locations_ui
...
Nicer locations UI
2022-06-06 10:23:04 -07:00
snipe
5f79534f4a
Merge remote-tracking branch 'origin/develop'
2022-06-05 22:44:53 -07:00
snipe
01348187c8
Fixed #11224 - only show menu options if the user is allowed
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 22:41:53 -07:00
snipe
b26a4ad333
Added missing headers
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:35:57 -07:00
snipe
89f45d3d05
Removed extra console logs and unused variable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:16:29 -07:00
snipe
e83a062eda
Use translation string for model editing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:11:50 -07:00
snipe
1ea667e709
Update views with additional data fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:56 -07:00
snipe
5326ebd136
Removed toolbar div we weren’t using
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:45 -07:00
snipe
4db9892f8c
Use partial in overdue audit screen
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:12 -07:00
snipe
880828379e
Update bulki partials with new values
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:02:51 -07:00
snipe
9b54077409
Additional tweaks to BS tables partial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:02:19 -07:00
snipe
9f478b51e2
Additional JS tweaking
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 20:13:51 -07:00
snipe
7c77e03c5a
Initial rework of locations display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 18:08:15 -07:00
snipe
5bc5e9f108
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/lang/en/admin/locations/general.php
2022-06-05 17:14:31 -07:00
snipe
985e683896
Small display improvements
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 16:59:53 -07:00
snipe
514db05770
Merge remote-tracking branch 'origin/develop'
2022-06-03 13:29:04 -07:00
snipe
7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap
...
Added explicit “Example:” text in placeholders
2022-06-03 13:28:40 -07:00
snipe
8f5ac5fb55
Removed quotes around filter query
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 13:01:53 -07:00
snipe
54f828743e
Merge remote-tracking branch 'origin/develop'
2022-06-03 12:54:13 -07:00
snipe
f519fb747f
Merge pull request #11248 from snipe/fixes/corrected_gate_on_assetmodels
...
Updated Asset Model gate to correctly display the button on view
2022-06-03 12:53:52 -07:00
snipe
36f714e414
Updated Asset Model gate to correctly display the button on view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 12:52:53 -07:00
snipe
3071a83ae0
Added the validation strings for user creation password options
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 12:00:56 -07:00
snipe
1c4864a3cc
Added explicit “Example:” text in placeholders
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 11:25:18 -07:00
snipe
eebc56d54b
Merge remote-tracking branch 'origin/develop'
2022-06-02 16:33:04 -07:00
snipe
4e03ebe284
Don’t use the formatted date for diff days in audit report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-02 16:30:26 -07:00
snipe
7577fc61e4
Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories
...
fixed issue with misplaced div
2022-06-01 17:03:23 -07:00
Godfrey M
d302675056
fixed a div placement
2022-06-01 16:58:29 -07:00
Godfrey M
5316f41eba
fixed a div placement
2022-06-01 16:56:01 -07:00
snipe
fa6c463d46
Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories
...
Added history tab to accessories
2022-06-01 12:46:38 -07:00
snipe
23a441e7c8
Merge remote-tracking branch 'origin/develop'
2022-06-01 10:27:50 -07:00
snipe
1dbc1f4aa2
Fixed #11232 - missing closing div
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-01 10:26:26 -07:00
Achmad Fienan Rahardianto
fe65de1207
implements cookie to maintain display preference
2022-06-01 11:54:05 +07:00
snipe
089704c4f9
Merge remote-tracking branch 'origin/develop'
2022-05-31 14:17:23 -07:00
Ivan Nieto Vivanco
3e44f39f4d
Set the new File column as not visible by default
2022-05-25 19:19:25 -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
2db6cf85a7
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2022-05-24 15:10:46 -07:00
snipe
5be7dee3d3
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 15:07:14 -07:00
snipe
d8a8e03bf6
Nicer styling
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 14:39:01 -07:00
snipe
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
Ivan Nieto Vivanco
a4cf601c98
Remove extra tag and other stylistic changes
2022-05-24 16:27:55 -05:00
Ivan Nieto Vivanco
1e3c0d597e
Use @can view directive instead of @if superadmin
2022-05-24 15:53:26 -05:00
snipe
91822d2e45
Use shorter helper config method
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:26:29 -07:00
snipe
5d83516659
Fixed typoe on maintenance screen
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:15:01 -07:00
snipe
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
snipe
4839985f38
Added forced space after admin/superadmin badge
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 12:59:36 -07:00
Ivan Nieto Vivanco
aa841a4674
Check permission before show links or not in requestable asset models view
2022-05-24 14:40:32 -05:00
Ivan Nieto Vivanco
6d1de73cad
Fixes some html structure in the requested assets view
2022-05-24 14:06:05 -05:00
Ivan Nieto Vivanco
0a6626891e
Add links to requestable Models' name
2022-05-24 13:36:13 -05:00
snipe
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
snipe
e34ea32a5e
Fixed translation styring reference
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-23 20:15:22 -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
4adb990a5d
removed line breaks and deadspace
2022-05-23 09:37:20 -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
f439970e7a
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
a37a576ee5
FIxed translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
2bd0679a81
A few more tweaks to PDFs
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
8c64e7359a
Added signature column, removed stored_eula_file column
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
14495cd1da
Nicer PDF display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
8449b5ca1e
Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create
...
Fixed : #11098 - Smartly overwrite fields with default values for custom fields
2022-05-18 16:12:12 -07:00
Brady Wetherington
e4b24e17f3
Improve comments because the logic is complicated and unintuitive
2022-05-18 16:06:39 -07:00
Brady Wetherington
981741062b
Try to intelligently overwrite fields with default values for custom field
2022-05-18 15:51:32 -07:00
snipe
a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies
...
Thanks!
2022-05-18 15:45:30 -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
Godfrey M
ab23e04c65
re-adds Request::is to setting categories
2022-05-18 14:33:41 -07:00
Godfrey M
877b1bd0a3
re-adds Request::is to setting categories
2022-05-18 14:31:03 -07:00
Godfrey M
eaeb74c576
readded comment
2022-05-18 13:13:38 -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
Godfrey M
0ed59753da
updated less files for license details to adhere to dark skin themes
2022-05-18 10:55:57 -07:00
Godfrey M
75f5f3a0a8
fixes inconsistencies with links styling
2022-05-18 09:37:53 -07:00
Godfrey M
07679aa376
settings treeview won't stay active. still experimenting with potential solutions
2022-05-18 08:40:37 -07:00
snipe
4078e4e323
Added spinner onClick for file upload button on backups
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 02:40:32 -07:00
snipe
ceffbb950f
Fixed #11120 - custom fields not showing when textarea is present as field type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 00:47:22 -07:00
snipe
0f9559c1ff
Fixed #11124 - updated maintenance page
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 19:01:37 -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
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
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
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
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
3fe0e04d52
Fix roite for people file deletion
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-14 08:25:22 -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
Brady Wetherington
b6284e6651
Fix 'cancel' button in two-factor screen
2022-05-13 14:49:37 -07:00
snipe
d8a4509b22
Fix logout on 2fa
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 14:36:20 -07:00
snipe
c0868a68fb
Removed console.log cruft
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:44:38 -07:00
snipe
eccc5e7cf0
Make logout a post on 2FA cancel
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:35:13 -07:00
snipe
b36bfad0ca
Set maxlength on password confirmation form element
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:27:47 -07:00
snipe
6b27c0311d
Updated help text on groups for more info on deselecting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:23:12 -07:00
snipe
93454decec
Fixed broken quotes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:14:53 -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
714f6d80f2
Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape
...
Bootstrap tables export as landscape
2022-05-12 09:28:47 -07:00
Godfrey M
54f5e268a0
removed change from tableExport.js
2022-05-12 09:20:19 -07:00
Godfrey M
83d0743ab8
saves bootstrap pdf tables in landscape
2022-05-12 09:18:44 -07:00
snipe
91cc08d3fb
Merge pull request #11050 from uberbrady/fix_encrypted_textareas
...
Make sure to decrypt Textareas as well as input type=text
2022-05-11 19:03:02 -07:00
Godfrey M
8ebe64e630
fixes final visual issue
2022-05-11 12:13:36 -07:00
Brady Wetherington
e3696ff84c
Make sure to decrypt Textareas as well as input type=text
2022-05-10 18:39:03 -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
33b1ab3658
prevents values for assets being negative through validation
2022-05-10 16:19:06 -07:00
Godfrey M
c07a244bab
fixes 1/2 visual issues, adds history tab to accessories
2022-05-10 11:20:42 -07:00
snipe
d5edb0908b
Added translation string to the correct file this time
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:07:05 -07:00
snipe
89fee23d32
Commented out console log that was pooping up the joint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 08:34:30 -07:00
snipe
2982d78899
Added translation for no assets selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:42:02 -07:00
snipe
304cd75af5
Fixed extra divs
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:44 -07:00
snipe
59a0f4722b
Use partial for asset bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:35 -07:00
snipe
418a797e7e
Use partial for asset bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:20:29 -07:00
snipe
0c20543c49
Remove conflicting toolbar call in model listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:58 -07:00
snipe
fe98e505fe
Use the new partial for bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:31 -07:00
snipe
78a9c16761
Minor formatting improvements
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:15:10 -07:00
snipe
c4bf0045c8
Fixed stray < tag
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:55 -07:00
snipe
c64f34ebcc
Check the "do not change” radio button by default
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:31 -07:00
snipe
cf0548bd1f
Create a new partial for asset bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:11:52 -07:00
snipe
caef98d36d
Patched #11025 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:06:12 -07:00
snipe
fba731ac1c
Missed a few hard coded english strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:01:17 -07:00
snipe
784bf4d784
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
2022-05-06 01:52:43 -07:00
snipe
39ee825ba2
Fixed html lang specification
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 01:32:20 -07:00
snipe
c0e9393092
Fixed #10890 - use translation strings in user asset printout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 01:30:58 -07:00
snipe
3a415b2fce
Use full app_url in favicon paths
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 00:19:32 -07:00
snipe
5370c2ca42
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all
...
[Fix] changes the query for the accept signature on print blade
2022-05-05 13:32:37 -07:00
snipe
953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
...
Merge master into develop for RC 6.0.0-8
2022-05-05 10:53:17 -07:00
snipe
c01f0880ef
Changed language string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 10:52:57 -07:00
Johnson Yi
281c6df7b3
Customize login page when REQUIRE_SAML is enabled
2022-04-29 15:35:40 +00:00
snipe
edab4e1371
Uses str_slug for filename for JS export (like we do elsewhere)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-28 21:55:26 +01:00
snipe
9aac1cbba4
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
Achmad Fienan Rahardianto
dafe353050
Implements #8155 to improve the workflow during asset creation
...
- adding 2 options to hide optional information
2022-04-23 14:41:38 +07:00
Godfrey M
380cb38b7d
changes the query for the accept signature on print blade
2022-04-14 17:17:28 -07:00
snipe
5fba8202d6
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-11 15:40:58 +01:00
Brady Wetherington
4db7cb0e21
This disables the display of HTML content during exports, without enabling XSS attacks
2022-04-07 16:37:32 +01:00
Brady Wetherington
5a776af091
This disables the display of HTML content during exports, without enabling XSS attacks
2022-04-07 16:27:06 +01:00
snipe
01342ca266
Fixed activity report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-05 22:58:25 +01:00
snipe
8195a664a9
Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop
...
Fixes Importer always update existing values develop
2022-04-05 21:11:24 +01:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco
2d213a9c77
Make the report take the dates of pivot table instead of asset log
2022-04-05 12:57:49 -05:00
snipe
08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view
...
Fixes #10898 (invalid consumable date time info in user view)
2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto
231a34ace3
FIX : #10898 (invalid consumable date time info in user view)
2022-04-05 15:31:27 +07:00
Ivan Nieto Vivanco
1a448cc4b6
Take the values from the importer form to configure the used importer
2022-03-29 17:31:43 -06:00
snipe
8ccf148799
Fixed #10881 - bad merge with bootstrap-tables changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 22:57:00 +01:00