273 commits

Author	SHA1	Message	Date
snipe	1f5e4309fa	Updated webpack, new asset files ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 11:20:06 -07:00
snipe	5950ec27ab	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/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-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	2023-05-03 13:49:36 -07:00
snipe	577fff7d65	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-03 10:45:36 -07:00
snipe	42f0975414	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2023-04-25 22:19:27 -07:00
snipe	470a36a7c9	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 22:12:56 -07:00
snipe	9a73f5eca3	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # 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	2023-04-17 20:27:49 -07:00
snipe	9698c3b07b	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-17 20:14:50 -07:00
snipe	2b10357c4e	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-17 19:06:27 -07:00
snipe	46cce0115e	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2023-04-16 05:46:26 -07:00
snipe	21f5d39fa1	Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733) ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 05:43:42 -07:00
snipe	c683233aa3	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json	2023-04-06 15:00:38 -07:00
snipe	6164e8b3fa	Changed colors for disabled, removed dupe checkmark ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 23:53:57 -07:00
snipe	3bd87a2785	Removed iCheck ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 22:52:54 -07:00
snipe	3473e24de5	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 22:36:23 -07:00
snipe	2c47b63e91	Small tweaks to overrides ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 19:37:07 -07:00
snipe	c05ee5db0e	Built assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 17:08:54 -07:00
snipe	4035cd118e	Handle the column selector in bs table styling ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 14:35:47 -07:00
snipe	e066f033c8	First attempt at moving us away from iCheck ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 10:54:01 -07:00
snipe	823203641d	Updated assets with new font awesome ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 23:18:58 -08:00
snipe	1911480d3a	Updated font-awesome to ^6.3.0 ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 23:15:50 -08:00
snipe	b29276579f	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 20:34:31 -08:00
snipe	dbe0a3352b	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2023-02-28 20:34:20 -08:00
snipe	f9b5a67dc2	Compiled dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 20:32:08 -08:00
snipe	e7917d1f93	Rebuild prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 19:16:03 -08:00
snipe	6b729502c6	Rebuilt dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 19:13:40 -08:00
snipe	05a3f20d51	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-19 15:55:59 -08:00
snipe	0080ac92e7	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-19 15:52:06 -08:00
snipe	91d0c383df	Production assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 18:47:55 -08:00
snipe	e05764ac34	Truncate URL with ellipsis if too long ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 18:42:26 -08:00
snipe	97731cd7c8	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # 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-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/mix-manifest.json	2022-12-05 16:34:34 -08:00
Godfrey M	371a5bf4d6	changes the icon color with themes	2022-11-30 10:37:47 -08:00
snipe	c8baf4c6ad	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 16:25:43 -07:00
snipe	ecc6bd8a24	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 16:24:31 -07:00
snipe	da40c0ad48	Dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 18:09:18 -07:00
snipe	1377725a97	Dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-27 14:53:47 -07:00
snipe	58ccfe9226	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net> # 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	2022-09-27 14:51:19 -07:00
snipe	05ac9f4a68	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-27 14:47:54 -07:00
snipe	0889cd61cf	Updated skins ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-27 14:47:09 -07:00
snipe	de399a9f8f	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/all.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2022-09-27 14:46:30 -07:00
snipe	942eaac2ee	Upgraded fontawesome ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-27 14:25:44 -07:00
snipe	0924d2144b	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2022-09-15 21:47:14 -07:00
snipe	ca70988879	Larger checkbox in lists ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 21:42:16 -07:00
snipe	421c9baecc	# Conflicts: ... Signed-off-by: snipe <snipe@snipe.net> # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json	2022-09-15 20:11:07 -07:00
snipe	07e0fec1de	Downgraded BS Tables ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 20:05:29 -07:00
snipe	a8a00f0a79	Updated prod JS assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-12 11:08:29 -07:00
snipe	448aefac28	Updated compiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-12 10:54:54 -07:00
snipe	ab60fa08df	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-24 16:38:11 -07:00
snipe	8b03abde8d	Production assets for dark skin fix ... Signed-off-by: snipe <snipe@snipe.net> # 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	2022-07-22 15:39:46 -07:00
snipe	c5530104ff	Fixed #11549 - dark skin dropdowbn menu fixes ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-22 15:36:51 -07:00
snipe	0d656e3963	Production assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-18 17:29:37 -07:00
snipe	50ce471dc6	Production assets ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2022-07-18 17:29:29 -07:00
snipe	6f1f6c75e6	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2022-07-15 17:11:55 -07:00
snipe	58499c2322	Fixed #11508 - font size in alert menu ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-15 17:09:17 -07:00
snipe	30c03435e4	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/mix-manifest.json	2022-07-07 16:01:17 -07:00
snipe	9c86b4bf88	Fixes padlock icon ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 15:57:33 -07:00
snipe	3a6c6d8466	Prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 14:40:39 -07:00
snipe	b98af0f50f	Upgrade font-awesome to v6 ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 14:22:08 -07:00
snipe	18c37c97b8	Dark skin prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:14:12 -07:00
snipe	3a8786fdb7	Updated assets for prod ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:27:31 -07:00
snipe	f4c346a57c	Small fixes to default blue skin ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:11:42 -07:00
snipe	4b9ec9218d	Upgraded/updates assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-22 15:54:58 -07:00
snipe	a758e825ed	Dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 13:45:33 -07:00
snipe	5fe1078013	Squashed commit of the following: ... commit a011b07d99 Merge: b392ed269 6059e9e11 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:52:50 2022 -0700 Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables Added fullscreen option to tables commit b392ed269b Merge: 693043e64 e6d792bdf Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:52:41 2022 -0700 Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header Tweaked CSS for smaller padlock commit 6059e9e119 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:49:00 2022 -0700 Added fullscreen option to tables Signed-off-by: snipe <snipe@snipe.net> commit e6d792bdf7 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:43:12 2022 -0700 Tweaked CSS for smaller padlock Signed-off-by: snipe <snipe@snipe.net> Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:54:18 -07:00
snipe	7cd35a80b6	Updated assets for production ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:52:47 -07:00
snipe	eaecf8137a	Updated assets for develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 19:52:27 -07:00
snipe	61a6c83418	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/mix-manifest.json	2022-05-18 17:21:32 -07:00
snipe	319eae7810	Recompiled dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 16:21:04 -07:00
snipe	4b21d9e7f4	Rebuild production assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 11:13:18 -07:00
snipe	3bf2328db2	Regenerated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 11:11:34 -07:00
snipe	bf028adcc3	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 19:33:50 -07:00
snipe	be5be7a8b9	Bumped packages ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 19:30:57 -07:00
snipe	ce5ae80755	Regenerated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 13:44:51 -07:00
snipe	c0868a68fb	Removed console.log cruft ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 13:44:38 -07:00
snipe	13d81f0a0c	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 11:55:19 -07:00
snipe	784bf4d784	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js	2022-05-06 01:52:43 -07:00
snipe	a5760cfe7b	Update BS tables and table export to latest ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 12:22:20 -07:00
snipe	809fe7f6d8	Compiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 19:28:58 +01:00
snipe	5314ef97e5	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:08:39 +01:00
snipe	54d6a4d978	Fixed #10825 - selectlists in modals b0rked ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 08:23:50 -07:00
Godfrey M	708dc08b4f	mixes color contrast on dropdown menu from navbar ... on file	2022-03-03 09:27:52 -08:00
snipe	ee47a02792	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-21 12:33:49 -08:00
snipe	43c57c8461	Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php	2022-01-12 20:51:33 -08:00
snipe	303fc39966	Regenerated assets to pikc up #10089 changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-11 14:38:17 -08:00
Wächtler, Yannick	b77e7f88d4	fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix	2022-01-09 17:35:28 +01:00
snipe	8be6d10dbe	Fixed #10467 - Safari only font-awesome bug ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-24 12:30:34 -08:00
snipe	f4ef828332	Fixex js table export ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-24 11:17:36 -08:00
snipe	312200bf44	Removed duplicate "department" entry in importer, pulls #10460 to master ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-21 13:37:20 -08:00
snipe	174d23a42a	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:29:57 -08:00
snipe	05c6254fdc	Updated snipeit.js with "restore" modal code ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:39:33 -08:00
snipe	fba0e2b712	Revert tableexport ... (It broke the npm run prod build) Signed-off-by: snipe <snipe@snipe.net>	2021-11-03 16:17:19 -07:00
snipe	3951de1669	Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you	2021-10-28 17:13:37 -07:00
snipe	4a98519c1f	Compiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:30:25 -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	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