Brady Wetherington
|
68263ff806
|
Changed selectlist results to be 'items' for internal consistency
|
2020-07-16 15:33:38 -07:00 |
|
|
Brady Wetherington
|
318da67230
|
Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5
|
2020-07-13 17:43:15 -07:00 |
|
Daniel Meltzer
|
7ea862787c
|
Refactor controller to use one method that shows all modals based on name.
|
2020-05-23 15:24:00 -04:00 |
|
|
Daniel Meltzer
|
1321304720
|
Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses.
|
2020-05-12 14:38:21 -04:00 |
|
snipe
|
730632e2eb
|
Apply PR #8043 to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 22:57:55 -07:00 |
|
|
snipe
|
3613da3685
|
Fixed dashboard boxes
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-27 23:05:04 -07:00 |
|
|
snipe
|
b433b49469
|
Ficing webpack, CSS and JS (*whew* that sucked)
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-27 22:41:33 -07:00 |
|
|
snipe
|
88d39b4287
|
Updated generated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-23 22:46:41 -07:00 |
|
|
snipe
|
c50b81ff19
|
Added resources
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:15:24 -07:00 |
|
|
snipe
|
b5cc845216
|
Removed vendor.js from setup blade
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:15:12 -07:00 |
|
|
snipe
|
599cf23d63
|
Added icheck icons to resources
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:14:23 -07:00 |
|
|
snipe
|
a160da6619
|
Removed unused styles
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 07:11:38 -07:00 |
|
|
snipe
|
3a446e6396
|
Updated variables.less with additional values
Signed-off-by: snipe <snipe@snipe.net>
|
2020-04-22 06:40:27 -07:00 |
|
|
snipe
|
64b0dbdafe
|
Fixed mismatched html tag
|
2020-04-21 10:42:09 -07:00 |
|
|
snipe
|
dc6e329d96
|
Fixed name in comments
|
2020-04-21 06:18:24 -07:00 |
|
|
snipe
|
aaaf5f8b42
|
Missed a mismatched h2
|
2020-04-21 04:23:53 -07:00 |
|
|
snipe
|
4fe32e1c9c
|
Fixed broken h2 tag
|
2020-04-21 04:22:09 -07:00 |
|
|
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
|
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
|
320d660e83
|
Updated chartjs
|
2020-04-06 21:17:26 -07:00 |
|
|
snipe
|
c18646d096
|
Yellow highlight on selected rows
|
2020-04-06 21:00:11 -07:00 |
|
|
snipe
|
0d3c18d1df
|
Fixed importer vue code for niceer layout
|
2020-04-06 15:09:37 -07:00 |
|
|
snipe
|
21d8225696
|
Use button primary for higher contrast
|
2020-04-02 18:33:26 -07:00 |
|
|
snipe
|
2d2cd68061
|
Switched to h2 from h4
|
2020-04-01 03:51:08 -07:00 |
|
|
snipe
|
0cf70c9e16
|
Fixed select2 placeholder
|
2020-04-01 01:26:19 -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
|
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
|
c408c27bf4
|
Updated dark skins
|
2020-03-31 21:10:55 -07:00 |
|
|
snipe
|
bfa9c0c528
|
Updated dark skins with updated styles
|
2020-03-31 20:58:54 -07:00 |
|
|
snipe
|
9cc9cddd68
|
Fixed visited button text color
|
2020-03-31 20:39:41 -07:00 |
|
|
snipe
|
ba8bcd6413
|
Slight tweaks to div table styles
|
2020-03-31 18:39:41 -07:00 |
|
|
snipe
|
dfeabbc85d
|
Added table-styles div CSS
(Still needs to be applied for dark mode skins)
|
2020-03-31 17:28:40 -07:00 |
|
|
snipe
|
03be4e74df
|
Higher contrast pagination
|
2020-03-28 04:00:46 -07:00 |
|
|
snipe
|
f305885e8e
|
Regenerated assets
|
2020-03-28 03:43:35 -07:00 |
|
|
snipe
|
c299efca0c
|
Darkened the home screen boxes for high contrast
|
2020-03-28 02:41:43 -07:00 |
|
|
snipe
|
db75f0e894
|
Regenerated assets
|
2020-03-28 01:38:01 -07:00 |
|
|
snipe
|
4b22f07dd7
|
Fixed less attribute names
|
2020-03-28 01:37:27 -07:00 |
|
|
snipe
|
57cb5146fc
|
Just use navy for links
|
2020-03-28 01:37:13 -07:00 |
|
|
snipe
|
34a1bb7152
|
Fixed contrast skin
|
2020-03-28 00:24:37 -07:00 |
|
|
snipe
|
8787f228d9
|
Fixed asset build
|
2020-03-28 00:16:28 -07:00 |
|
|
snipe
|
623655b6f6
|
New dark background skins
|
2020-03-28 00:07:34 -07:00 |
|
|
snipe
|
da6830225a
|
Remove light colored less files - it looks crappy
|
2020-03-28 00:06:51 -07:00 |
|
|
snipe
|
a729410fe8
|
Regenerated JS
|
2020-03-27 22:03:30 -07:00 |
|
|
snipe
|
03a9219a7c
|
Fixed duplicate color: attribute
|
2020-03-27 22:01:43 -07:00 |
|
|
snipe
|
9a2ee2638b
|
Updated color-specific skins
|
2020-03-27 21:46:00 -07:00 |
|