103 commits

Author	SHA1	Message	Date
snipe	ce1d3284b0	Buld assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 10:12:14 -07:00
Brady Wetherington	bf344fd707	Merge branch 'develop' ... mix-manifest I just picked one. version.php will get bumped by hand bootstrap table seems to just be another copy? Added it back.	2021-04-14 09:58:21 -07:00
snipe	7ddcc97e79	Generated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 20:35:58 -07:00
Brady Wetherington	6b86e2a58f	Rebuilt all assets after all commits had landed	2021-04-06 20:16:59 -07:00
Brady Wetherington	792a31cc7f	Merge branch 'develop'	2021-04-06 20:10:22 -07:00
Joel Pittet	af8509c4d0	Allow NPM packages to build for production (#9171) ... * add back changes before compiling assets * new css location and mix manifest * update papaparse, most vunerabilities attached to it * update axios and papaparse for security releases * removing security fixes that still allow npm run production to work * Update lodash	2021-04-05 22:01:11 -07:00
snipe	77ec64aded	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json	2021-03-02 12:33:18 -08:00
Godfrey Martinez	b0078ff64d	Audit dark mode theme skins and check for [ch15847] (#9102) ... Co-authored-by: snipe <snipe@snipe.net>	2021-02-25 19:41:31 -08:00
snipe	931e2df3bd	Updated production assets ... # Conflicts: # public/js/build/app.js # public/js/dist/all.js	2021-02-19 10:05:29 -08:00
snipe	785bc40d9d	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-yellow.css # public/mix-manifest.json	2021-02-17 13:50:14 -08:00
Godfrey Martinez	8fb97da314	Color of asset selection in bulk checkout [ch15525] (#9145)	2021-02-17 12:56:26 -08:00
snipe	3dc67cdba6	Updated dark skins with compiled assets for prod	2021-02-03 15:20:26 -08:00
snipe	0bbe0c85d7	Small improvement to topnav dropdown text colors in dark skins	2021-02-03 15:17:31 -08:00
snipe	721add5bc1	Merge remote-tracking branch 'origin/develop' ... # Conflicts: # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/mix-manifest.json	2021-02-03 00:57:58 -08:00
snipe	ff8fa6ec77	Production assets for better contrast in dark mode skins	2021-02-03 00:52:23 -08:00
snipe	e0a6f22489	Small fixes to dark mode skins	2021-02-03 00:49:09 -08:00
Godfrey Martinez	cf368a4577	fixed an issue with links colors (#9073) ... * fixed an issue with links colors * corrected btn-default's color	2021-02-01 13:50:37 -08:00
Godfrey Martinez	0dc78fdea6	fixed color schema on dark mode skins for links (#9034)	2021-01-21 14:41:42 -08:00
Godfrey Martinez	444f9a81da	Bug/ch15603/read only text field in saml screen dark (#8993) ... * fixed dark mode skins read only color schema * fixed dark mode skins read only color schema	2021-01-11 14:07:55 -08:00
Godfrey Martinez	55a526a6b3	corrected background color for bulk checkout listable items in all da… (#8916) ... * corrected background color for bulk checkout listable items in all dark schemas * resubmitting	2020-12-15 12:37:22 -08:00
snipe	75b8c3455c	Fixed #8609 - custom fieldsets not draggable anymore (regression)	2020-11-12 23:38:12 -08:00
snipe	8890372a69	Production assets with dark skin fixes	2020-11-11 14:47:13 -08:00
Godfrey Martinez	80f2d749a2	Corrected css to the bootstrap popovers for all dark mode skins (#8714) ... * added css to the bootstrap popovers in dark blue * corrects the tool tips css for all dark mode skins other than dark blue	2020-11-11 14:11:39 -08:00
snipe	d317052ede	Updated CSS assets with green skin edits	2020-10-23 18:55:00 -07:00
snipe	1090b291c3	Updated node packages, reregnerated assets	2020-10-19 16:56:59 -07:00
snipe	e750b2b2da	Added envelope css to overrides for table header	2020-09-11 16:06:19 -07:00
snipe	7cab9f48e5	Use darker red for errors	2020-08-31 19:40:49 -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	72a1616b3c	Removed wonky assets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 21:02:42 -07:00
snipe	88d39b4287	Updated generated assets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:46:41 -07:00
snipe	94e8343f63	Generated skins in css/dist/skins ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:13:09 -07:00
snipe	a160da6619	Removed unused styles ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:11:38 -07:00
snipe	a44d1cc0cf	Fixed iCheck ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 06:02:55 -07:00
snipe	e1784394b3	Moved js, skins and primary CSS into dist directory ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 03:39:42 -07:00
snipe	381d2369b6	Updated CSS assets	2020-04-21 06:33:44 -07:00
snipe	58f6b2da5a	Fixing assets	2020-04-21 03:42:35 -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	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	824ebc19c0	Updated assets	2020-04-08 11:24:17 -07:00
snipe	0d3c18d1df	Fixed importer vue code for niceer layout	2020-04-06 15:09:37 -07:00
snipe	756361584a	Updated assets	2019-08-14 22:22:33 -07:00
snipe	bca82684a1	Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # 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	2019-03-20 02:17:02 -07:00
snipe	dee92cfc6c	Fixes XSS vulnerabilities (#6831) ... * Properly escape log_meta values * Vue syntax fix to allow npm run dev to work again * Janky fix for Select2 bug * Compiled production assets * Escape user’s last name in API * Removed duplicate alertClass * Compiled production assets	2019-03-18 20:49:32 -07:00
snipe	3d4a5a8066	More importer tweaks for dept and manager	2018-11-07 18:05:53 -08:00
Wes Hulette	3c59452e33	Fixed Tooltips and Rounded corners from previous cleanup (#6285) ... * Fixed missing oauth tables during setup. * Fixed tooltip and square boxes	2018-10-03 13:17:08 -07:00
snipe	c8bff3ef38	Features/add manager and dept to importer (#6277) ... * Ignore the simlink for public storage * Added manager and department to user import * More UI importer tweaks * Fisxed typos	2018-10-02 15:43:54 -07:00
Wes Hulette	1742867df1	Removed inline signature.css ... Added to webpack	2018-10-01 08:20:31 -04:00
Wes Hulette	11f128a84f	Moved chart.js library into vendor.js	2018-09-28 17:28:49 -04:00