2187adf59a
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-19 15:34:58 +01:00
82d93b6980
Point to existing translation
2025-04-17 23:32:11 +00:00
72b2b2d819
Refactor to translatable placeholder text
2025-04-17 23:30:08 +00:00
3358382358
Comment out location scoping option for now
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-09 21:44:38 +01:00
1307146831
changing where translations live. coalescing
2025-04-09 16:21:48 -04:00
420278c63b
Nicer layout for settings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-08 15:12:36 +01:00
43c15ef134
Merge branch 'develop' into feature/locations_with_companies
2025-04-08 09:18:48 +01:00
443a5c2348
chaning username dropdown to be usernames and not emails
2025-04-07 19:25:32 -04:00
2a156776a4
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
2025-03-04 11:19:38 -08:00
cc0b9f404a
merged develop, fix conflicts
2025-02-27 15:38:31 -08:00
27aeb518ff
Replace Form::checkbox on general settings page
2025-02-26 16:18:00 -08:00
071b4d1e67
Merge pull request #16245 from marcusmoore/chore/migrate-form-open-pt5
...
Replace Form::open and Form::close pt5
2025-02-18 21:23:15 +00:00
ac907add83
Merge pull request #16082 from marcusmoore/chore/sc-28173
...
Replace calls to Form::text
2025-02-18 14:58:40 +00:00
894754e8dc
Migrate Form::close on general settings page
2025-02-12 13:18:55 -08:00
0797c4ac97
Merge branch 'develop' into chore/sc-28173
...
# Conflicts:
# resources/views/settings/saml.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
2025-02-10 15:57:41 -08:00
b4ea75f34f
Merge branch 'master' into chore/migrate-textarea-helper
2025-02-10 23:47:13 +00:00
00e7795414
Merge branch 'develop' into chore/migrate-select-helper
...
# Conflicts:
# resources/views/partials/forms/edit/company.blade.php
2025-02-10 15:44:02 -08:00
a331e14ef2
Migrate form labels on general settings page
2025-02-05 14:19:34 -08:00
0dfb71cfe5
added some translations to branding and general setrting
2025-01-28 11:56:10 -08:00
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies
2025-01-17 17:18:17 +00:00
0ef20c524f
Replace Form::text in certain views
2025-01-15 13:01:32 -08:00
e45f563b50
Convert Form::textareas to blade component
2025-01-14 13:16:31 -08:00
9a043da005
Convert additional Form::select to blade component
2025-01-13 16:16:49 -08:00
1318dc6111
Add a backward compatibility setting for locations with companies
...
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
2024-11-04 10:03:38 +01:00
5cb940c2ee
Merge branch 'refs/heads/upstream/dev' into feature/sc-26415
2024-10-16 18:32:36 -04:00
aa55fa6ff4
Switch to form requests for settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-09 18:16:34 +01:00
700647c53f
setting created
2024-10-02 18:15:52 -04:00
be5f3f38f8
Settings pages
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 14:48:12 +01:00
bffba02511
Updated icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-18 17:26:44 +01:00
3a96e501cc
use old school input
2024-08-07 10:54:06 -07:00
6b1784f2ee
makes shortcuts optional
2024-08-07 10:47:16 -07:00
46a6a84ecb
adds migration and translations
2024-08-06 11:07:39 -07:00
3f20e29901
Moved gthe settings for remote loading to the branding section
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:55:47 +01:00
d687b20467
Use more modern reference for input text
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-27 15:05:47 +01:00
4d55765e28
Added checkbox to settings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:02:53 +01:00
d9cc3c3ec7
Removed extra divs
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-17 12:52:23 +01:00
32c360f032
Re-added UI for load_remote
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-05 18:23:52 +00:00
da38945a53
Small fixes to checkbox layout in general settings blade
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-22 14:10:39 +01:00
9a3e727390
Updated other form fields to use new label class, fixed HTML for accessibility
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-03 22:38:56 -07:00
70c766e8b3
Added setting to choose dashboard type
...
Signed-off-by: snipe <snipe@snipe.net >
2022-09-29 04:16:46 -07:00
77a1fcb1fc
There was actually a missing p tag too
2022-08-09 06:36:53 -04:00
0cf0598936
Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly
2022-08-09 06:32:03 -04:00
9164daf5bc
Added localized strings for admin/settings
2021-11-19 15:23:48 +01:00
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net >
2021-09-26 01:11:08 -07:00
6a2e21f502
More in depth error reporting on mail test failure
2020-11-12 13:22:49 -08:00
002ca52c83
Standardize feature disabled messages in UI
2020-09-16 15:09:58 -07:00
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
fd642e95eb
Hide success icons from screen readers
2020-04-01 03:25:07 -07:00
9ab3370be5
Hide icons in error messages
2020-04-01 03:21:15 -07:00
snipe