Godfrey M
|
833af55806
|
Merge branch 'develop' into barcode_settings_hide
|
2024-12-12 12:05:29 -08:00 |
|
snipe
|
4d848e45e6
|
Fixed #15736
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-28 11:55:24 +00:00 |
|
|
Godfrey M
|
44447b85c9
|
Merge branch 'develop' into barcode_settings_hide
|
2024-09-26 11:27:05 -07:00 |
|
|
snipe
|
66249a37ed
|
Tweaked styles
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-24 11:08:31 +01:00 |
|
|
snipe
|
96712cb398
|
Fixed app settings view on mobile
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-24 10:55:26 +01:00 |
|
|
Godfrey M
|
fa5651f335
|
remove getbarcodes, postbarcodes, barcodes settings blade
|
2024-09-17 16:21:26 -07:00 |
|
|
Godfrey M
|
ce987b4f6d
|
added front end barcodes to labels
|
2024-09-17 11:23:38 -07:00 |
|
|
Godfrey M
|
df8b1c0240
|
hides barcode settings if new label engine enabled
|
2024-09-03 12:29:52 -07:00 |
|
|
snipe
|
be5f3f38f8
|
Settings pages
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 14:48:12 +01:00 |
|
|
Godfrey M
|
5d1c48c071
|
fixes alignment, and box issue with pie chart
|
2024-08-13 10:11:49 -07:00 |
|
|
Godfrey M
|
db9c435ae0
|
removed extra div tags
|
2024-05-20 10:48:57 -07:00 |
|
|
snipe
|
3594ed67d1
|
Removed back buttons on settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 20:48:32 +01:00 |
|
|
snipe
|
619712b927
|
Fixed table
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 13:45:46 +01:00 |
|
|
snipe
|
359cd2a267
|
A few more config options
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 13:28:13 +01:00 |
|
|
snipe
|
456d55c3bd
|
Added some mail settings to /settings for easier reference
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-21 16:14:47 +01:00 |
|
|
snipe
|
27e0484072
|
I lied. Missed one
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:12:22 -07:00 |
|
|
snipe
|
4da40792ea
|
Use google logo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:08:28 -07:00 |
|
|
snipe
|
6ab214d3a6
|
Added google option to settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:55:04 -07:00 |
|
|
Godfrey M
|
b6d105c4f4
|
removes help text from general integrations
|
2023-03-13 10:49:41 -07:00 |
|
|
Godfrey M
|
35dd0d8def
|
adds generalized webhooks, updates settings page, translations, validation
|
2023-03-07 15:48:21 -08:00 |
|
|
Godfrey M
|
2994c3613a
|
adds clearfix to settings page
|
2022-08-22 10:46:15 -07:00 |
|
|
snipe
|
75d19d815d
|
Still show the purge button even if not allowed to avoid confusion
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-24 15:59:40 -07:00 |
|
|
snipe
|
77bf28bcb6
|
Disallow purge
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 20:11:43 -07:00 |
|
|
snipe
|
ce2362459c
|
Layout tweak for search and back placement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:30:52 -07:00 |
|
|
snipe
|
4e568bec8a
|
Moves the settings search box higher
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:25:30 -07:00 |
|
|
snipe
|
35365882ac
|
Used new settings_button class in settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 18:10:28 -07:00 |
|
Wächtler, Yannick
|
9164daf5bc
|
Added localized strings for admin/settings
|
2021-11-19 15:23:48 +01:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -07:00 |
|
|
snipe
|
f357d9fc90
|
Include audit settings text in settings overview so they get picked up by the filter box
|
2020-10-23 18:13:28 -07:00 |
|
|
snipe
|
4fd5358aa8
|
Changed login attempts icon so it’s not the same as SAML
|
2020-09-15 20:27:01 -07:00 |
|
Johnson Yi
|
b2930d6069
|
Added #542: add saml authentication
|
2020-05-06 00:06:19 +10:00 |
|
|
snipe
|
be446eedb0
|
Updated html styles on settings index
|
2020-04-21 06:29:08 -07:00 |
|
|
snipe
|
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 |
|
|
snipe
|
320d660e83
|
Updated chartjs
|
2020-04-06 21:17:26 -07:00 |
|
|
snipe
|
fb903b2fda
|
Added comments, better indenting
|
2020-04-06 21:05:42 -07:00 |
|
|
snipe
|
7bf398aca4
|
More settings filter fixes
|
2020-04-06 20:47:05 -07:00 |
|
|
snipe
|
f6bb655383
|
Prevent form submission
|
2020-04-06 20:17:44 -07:00 |
|
|
snipe
|
19f71face9
|
Added filtering to settings page
|
2020-04-06 20:11:13 -07:00 |
|
|
snipe
|
c6c75cc11f
|
Fixed missing </h3 tags
|
2020-03-31 23:36:56 -07:00 |
|
|
snipe
|
bde45cbb34
|
Fixed h3 to h2 for semantic header levels
|
2020-03-31 21:30:24 -07:00 |
|
|
snipe
|
c71dd9b68a
|
Added sr-only text
|
2020-03-31 17:29:06 -07:00 |
|
|
snipe
|
2a813244a2
|
Wrapped text in h5s, added aria hidden to icons
|
2020-03-27 21:45:27 -07:00 |
|
|
snipe
|
694166862e
|
Added attempted logins admin screen (#6018)
* Added attempted logins admin screen
* Smaller table spacing
|
2018-08-01 03:51:59 -07:00 |
|
|
snipe
|
765295136a
|
Added - ability to add custom footer text, hide user’s manual/support links
|
2018-01-24 07:02:30 -08:00 |
|
|
snipe
|
34442362ca
|
Fixes bad route for new groups
|
2017-10-18 02:35:30 -07:00 |
|
|
snipe
|
907b909223
|
Fixed language on settings page
|
2017-10-07 07:44:08 -07:00 |
|
|
snipe
|
2958630923
|
Fixed some settings text
|
2017-08-22 22:11:26 -07:00 |
|
|
snipe
|
c2927c4a2e
|
Added phpinfo page if debugging is enabled
|
2017-07-08 00:09:39 -07:00 |
|
|
snipe
|
ab2b2f3043
|
Updated UI for Admin Settings
|
2017-07-07 23:44:48 -07:00 |
|