439 commits

Author	SHA1	Message	Date
Guillaume Lefranc	494ed3d17a	Exclude web.config from Apache	2021-10-11 14:14:00 +02:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about ... I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -07:00
snipe	43a437000b	Slightly better right-padding on row-new-striped ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-29 11:20:32 -07:00
snipe	9a83b90e44	Make row-new-striped 100% width ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 15:04:57 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	8738451685	Fixed font awesome caret ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 23:17:35 -07:00
snipe	a9b306f2d2	Backing out the ribbon - too finicky on mobile :( ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:29 -07:00
snipe	8d1c3106b5	Building assets again ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:15 -07:00
snipe	dbe93d91cd	Updated fontawesome icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
snipe	383c2c8466	New assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 04:12:55 -07:00
snipe	9a299973ff	Mobile CSS overrides ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:19 -07:00
snipe	12df310449	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:16:58 -07:00
snipe	932c1364ee	Added userpics from thispersondoesnotexist.com ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 22:05:42 -07:00
snipe	919eaf320c	Updated javascript assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 19:00:53 -07:00
snipe	d069d032fc	Updated JS asset ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 18:59:13 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
Godfrey M	160017c720	more deadspace	2021-09-21 19:28:39 -07:00
Godfrey M	941cba73b9	removed deadspace and unnecessary css changes	2021-09-21 19:27:17 -07:00
Godfrey M	4a0c8de82a	adds jquery eventlistner to monitor chart.js width and refresh accordingly	2021-09-21 19:13:09 -07:00
Mike Frysinger	7b665ade0a	add rewrite rule for Let's Encrypt certificates ... The LE tools need access to a stable path to automatically obtain certificates, so add a rewrite rule to allow it.	2021-09-14 16:21:31 -04:00
snipe	c970464690	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:48:05 -07:00
snipe	f99602c039	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-08-18 00:47:33 -07:00
snipe	f8562e5835	Recompiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:45:02 -07:00
snipe	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
snipe	eca15bd49b	Merge pull request #9837 from Godmartinz/chore/ch16531/update-demo-photos-of-iphones-to-be-more ... Update demo photos of iPhones to be more [ch16531]	2021-07-27 14:34:52 -07:00
Godfrey M	013e168883	adds newer versions of devices for demo	2021-07-21 15:12:27 -07:00
Godfrey M	9fb911146f	Update demo photos of iPhones to be more [ch16531]	2021-07-19 12:26:04 -07:00
snipe	33e92c975a	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # 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-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-07-15 13:29:00 -07:00
Godfrey M	44612e5eb7	Make non linked striped text the same for [ch16602]	2021-07-14 14:50:45 -07:00
snipe	60b8320b4b	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-06 15:15:28 -07:00
snipe	11d9b1ba45	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-06 15:09:03 -07:00
snipe	ebb0aa5532	Merge pull request #9766 from uberbrady/livewire_integration_v6 ... Livewire integration for Snipe-IT v6	2021-06-28 21:51:00 -07:00
Brady Wetherington	f3427ee670	Tweak to composer packages to get it to composer install correctly	2021-06-28 21:08:05 -07:00
Brady Wetherington	ea1f1eb972	Get some basic Livewire going for 'edit model's default values.	2021-06-28 21:00:20 -07:00
Brady Wetherington	dce1dd41c8	Regenerate assets after repairing Vue integration	2021-06-28 16:38:05 -07:00
snipe	9b2cb19f22	Fixed #9743 - Vue screens not loading ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 10:59:34 -07:00
snipe	d20c425a56	Un-donked assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 20:10:06 -07:00
Brady Wetherington	8268aca9fc	Removed Ziggy.baseUrl references for meta references that had baseUrl	2021-06-23 19:57:45 -07:00
snipe	d037ec5b9c	Dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 18:08:50 -07:00
Godfrey M	a37edd5c5b	darkened back-sub-alt more	2021-06-23 16:34:41 -07:00
Godfrey M	f199098a59	undid the color change for links, darkened the back-sub-alt	2021-06-23 16:29:21 -07:00
Brady Wetherington	9456a03a88	Almost finished with the routes which is...hopefully? The last thing?	2021-06-22 16:58:23 -07:00
Brady Wetherington	5b42481d8f	Get it so that we can re-build assets.	2021-06-11 21:54:29 -07:00
snipe	a8123092af	Misc fixes for shift ... // TODO - re-fix the exception handler Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:07:50 -07:00
snipe	570a31a1c4	Merge remote-tracking branch 'origin/develop'	2021-05-05 10:29:10 -07:00
snipe	ab694347b0	Added favicon to demo dir ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 01:18:49 -07:00
snipe	67ac3631df	Production assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-04 22:05:26 -07:00
snipe	57b9b571dc	Fixed #9531 - highlight search box when filled, add clear button (#9534)	2021-05-04 22:00:34 -07:00
snipe	a1bc984d17	Generate production assets, bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:34:02 -07:00
snipe	d5894a4d64	Generated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:27:28 -07:00
snipe	1d43eda21f	Features: improved UI for importer (#9467) ... * Small UI improvements for importer Signed-off-by: snipe <snipe@snipe.net> * And UI backup improvements Signed-off-by: snipe <snipe@snipe.net>	2021-04-21 20:16:17 -07:00
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	7e56fc5e0d	Updated mix manifest	2021-03-02 12:33:39 -08:00
snipe	3f01b02fd9	Updated BS tables	2021-03-02 12:33:29 -08: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
snipe	2e298893b6	Updated mix manifest	2021-02-25 19:43:58 -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	6449d0aaf9	Sigh. Real assets	2021-02-19 10:06:06 -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	7f8eddede6	Updated compiled assets	2021-02-19 10:02:30 -08:00
snipe	4ddab03792	Merge branch 'develop' of https://github.com/sw-mreyes/snipe-it into sw-mreyes-develop ... # Conflicts: # public/mix-manifest.json	2021-02-19 10:00:35 -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
Marcelo Reyes	4c3b46ea88	Fixed #9129: add missing function formatDatalistSafe to snipeit_modals.js	2021-02-16 13:50:00 +01: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
snipe	124343911f	Merge remote-tracking branch 'origin/develop'	2021-02-02 16:57:18 -08:00
Brady Wetherington	9a224a07ba	Modified how we do Select2 dynamic drop-down menus to be more secure (#9079) ... * Modified how we do Select2 dynamic drop-down menus to be more secure As noted by the author of select2, the more-secure way of creating rich Select-dropdowns is to use jquery to create HTML snippets and carefully modify text attributes within there. This prevents any XSS from being brought to the page. As a side-effect, the extra escaping that we had to do in all of the internal selectlist calls is now no longer necessary, and has been removed. Rebased and squashed from the original. * Rebuilt all assets, but this still feels like it's too much stuff in here. * Whoops, need to run that in dev, not prod	2021-02-02 15:55:21 -08:00
snipe	de9f487664	Merge remote-tracking branch 'origin/develop'	2021-02-02 01:59:13 -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
snipe	585bdff364	Added other logo for demo	2021-01-27 00:35:32 -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
snipe	f65bc5caee	Updated logos	2020-12-21 11:35:17 -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	ffa2701f89	Fixed typo in demo logo	2020-11-30 18:59:44 -08:00
snipe	985f3658be	Added wider logo	2020-11-27 18:17:09 -08:00
snipe	75b8c3455c	Fixed #8609 - custom fieldsets not draggable anymore (regression)	2020-11-12 23:38:12 -08:00
snipe	b2a8af2fa9	Fixed #8647 - Added additional help info on importer page	2020-11-12 22:46:51 -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	f4080a7aa9	Fixed created_at and expired_at order in API token screen	2020-11-09 22:53:07 -08:00
snipe	33dca84ec7	Show expiry and created at date on API token page	2020-11-09 22:43:27 -08:00
snipe	410c99da17	Added signature-pad.min.css to the css directory - should possibly fix #8603	2020-11-02 23:57: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	a39069bc45	Small UI improvements to API keys page	2020-10-09 16:02:30 -07:00
snipe	2855a9b2e8	Added debugging to file upload for easier diagnostics	2020-09-15 20:07:46 -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	453fc718d9	Merge branch 'develop' into integrations/2020-08-31-dev-into-master ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Models/Ldap.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # 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/less/overrides.less # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # tests/unit/UserTest.php	2020-08-31 12:44:03 -07:00