snipe
|
f532e9b462
|
Fixing assets :(
Not sure what happened in tbis merge exactly
|
2020-04-21 03:07:11 -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
|
7ebd21bc04
|
Added sr-only to the unstyles image upload button
|
2020-04-09 19:29:16 -07:00 |
|
|
snipe
|
ec723a3da1
|
Changed LDAP messaging
|
2020-04-09 10:37:51 -07:00 |
|
|
snipe
|
83ee64f155
|
Added missing CSS class to text-only logo
|
2020-04-08 17:25:14 -07:00 |
|
|
snipe
|
b7d12ff944
|
Changed placeholder text back to lighter grey - it was confusing when darker
|
2020-04-08 17:24:59 -07:00 |
|
|
snipe
|
0858fec7f1
|
Fixed CSS issue where text-only logos at the top would be the wrong color
|
2020-04-08 17:24:38 -07:00 |
|
|
snipe
|
a0f7fdc57a
|
Merge branch 'fixes/accessibility_fixes'
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
|
2020-04-08 11:19:42 -07:00 |
|
|
snipe
|
b7d9790acb
|
Fixed color style for btn-sm.btn-warning and btn-sm.btn-danger
|
2020-04-06 21:59:30 -07:00 |
|
|
snipe
|
1a5785a8d3
|
Fixed dashboard header size
|
2020-04-06 21:30:28 -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
|
c18646d096
|
Yellow highlight on selected rows
|
2020-04-06 21:00:11 -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
|
d82b94e281
|
Pull blue stylesheet if no skin was selected
|
2020-04-06 19:04:49 -07:00 |
|
|
snipe
|
0d3c18d1df
|
Fixed importer vue code for niceer layout
|
2020-04-06 15:09:37 -07:00 |
|
|
snipe
|
a8032ac388
|
Switched to btn-primary for submit
|
2020-04-02 18:38:54 -07:00 |
|
|
snipe
|
21d8225696
|
Use button primary for higher contrast
|
2020-04-02 18:33:26 -07:00 |
|
|
snipe
|
766c2b22cb
|
Removed stray tag
|
2020-04-02 18:33:10 -07:00 |
|
|
snipe
|
bdddab5b8b
|
Added role=“option” to option items, additional icon font fixes
|
2020-04-02 18:17:21 -07:00 |
|
|
snipe
|
031adc3be4
|
Small display fixes to importer table
|
2020-04-01 19:51:36 -07:00 |
|
|
snipe
|
c906026acd
|
Merge branch 'master' into fixes/accessibility_fixes
|
2020-04-01 14:04:02 -07:00 |
|
|
snipe
|
56c2740b68
|
Radio button tweaks
|
2020-04-01 06:56:27 -07:00 |
|
|
snipe
|
4688d62b9f
|
Small UI fixes
|
2020-04-01 06:50:37 -07:00 |
|
|
snipe
|
99686bd73a
|
Added labels for bulk actions
|
2020-04-01 06:48:02 -07:00 |
|
|
snipe
|
120e224961
|
Add the ability to remove all group memberships in bulk
|
2020-04-01 06:35:13 -07:00 |
|
|
snipe
|
e27d69a31d
|
Remove viewport restrictions
|
2020-04-01 06:18:37 -07:00 |
|
Ivan Nieto
|
c492ba7245
|
Adding changes to 'upload-table' for being painted in CSS (#7934)
|
2020-04-01 05:24:05 -07:00 |
|
|
snipe
|
53658e365f
|
Removed duplicate HTML tag
|
2020-04-01 04:36:28 -07:00 |
|
|
snipe
|
4cfa0e36b1
|
Added labels to password reset
|
2020-04-01 04:30:54 -07:00 |
|
|
snipe
|
9d9b5d3885
|
Added form labels to auth screens
|
2020-04-01 04:29:54 -07:00 |
|
|
snipe
|
36f9905be0
|
Removed test code
|
2020-04-01 04:29:35 -07:00 |
|
|
snipe
|
2d2cd68061
|
Switched to h2 from h4
|
2020-04-01 03:51:08 -07:00 |
|
|
snipe
|
fd642e95eb
|
Hide success icons from screen readers
|
2020-04-01 03:25:07 -07:00 |
|
|
snipe
|
9ab3370be5
|
Hide icons in error messages
|
2020-04-01 03:21:15 -07:00 |
|
|
snipe
|
4dcc1ffdbc
|
More form labels
|
2020-04-01 02:22:24 -07:00 |
|
|
snipe
|
7718abaa72
|
Added aria-hidden
|
2020-04-01 01:26:44 -07:00 |
|
|
snipe
|
59c5a1ea87
|
Added aria label to form helper
|
2020-04-01 01:26:32 -07:00 |
|
|
snipe
|
0cf70c9e16
|
Fixed select2 placeholder
|
2020-04-01 01:26:19 -07:00 |
|
|
snipe
|
c3d2e8ff26
|
Added aria-hidden to inline form error text
|
2020-04-01 00:18:20 -07:00 |
|
|
snipe
|
192f703885
|
Trying placeholder CSS styling for the high contrast skin
Doesn’t seem to work :(
|
2020-04-01 00:15:58 -07:00 |
|
|
snipe
|
be93b23488
|
Added aria-label to form fields
|
2020-04-01 00:15:33 -07:00 |
|
|
snipe
|
b079d0d6d5
|
Use btn-primary for submit button
|
2020-03-31 23:38:10 -07:00 |
|
|
snipe
|
c6c75cc11f
|
Fixed missing </h3 tags
|
2020-03-31 23:36:56 -07:00 |
|
|
snipe
|
b188285bc9
|
Fixed empty table headings
|
2020-03-31 23:02:24 -07:00 |
|
|
snipe
|
6d659a84b8
|
Removed extra div tag
|
2020-03-31 22:53:58 -07:00 |
|
|
snipe
|
3e3828229d
|
Removed _tab from tab names
|
2020-03-31 22:52:21 -07:00 |
|
|
snipe
|
bf6a0f8d2f
|
Added aria-hidden
|
2020-03-31 22:50:38 -07:00 |
|