622 commits

Author	SHA1	Message	Date
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	86b04c7294	Updated prod assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-15 20:50:36 -07:00
snipe	20ab412e1e	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-15 20:45:35 -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	b91e914a61	Merge remote-tracking branch 'origin/develop'	2023-03-23 10:55:58 -07:00
snipe	e8e1ada776	Merge pull request #12669 from akemidx/feature/sc-20178 ... #20178: Added Dell and Lenovo to warranty link function	2023-03-22 00:54:40 -07:00
snipe	58ea1592bb	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/views/livewire/slack-settings-form.blade.php	2023-03-22 00:26:15 -07:00
akemidx	0909d94c8f	actually added the icons haha	2023-03-15 15:07:07 -04:00
snipe	ac0b22d696	Updated dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 00:33:04 -08:00
snipe	5defd5ec0a	Merge develop into master ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 19:59:17 -08:00
snipe	383b5b43bb	Added a few more jquery options for prevoew flexibility ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 18:54:38 -08:00
snipe	c7fb542dc3	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2023-03-06 17:13:29 -08:00
snipe	eec5163e7f	Updated vue assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 14:28:04 -08: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	6fbd20a11b	Merge remote-tracking branch 'origin/develop'	2023-01-31 19:50:18 -08:00
Ivan Nieto Vivanco	a7a578bf51	Added head only logo to be used as default in apple-touch-icon	2023-01-31 00:13:44 -06: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
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +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	b89979fbec	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2022-12-14 17:06:26 -08:00
snipe	8043b86786	Upgraded font awesome to 6.2.1 ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-14 16:41:56 -08:00
Godfrey M	d0d0058e79	removed unwanted changes	2022-12-06 11:19:28 -08:00
Godfrey M	bbd04f8876	adds the rest of the fields for Remote	2022-12-06 11:13:24 -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
Cram42	67d021e457	Add alpinejs to deferred scripts	2022-11-11 11:25:41 +08:00
Cram42	48fb4f2439	Add labels route for testing layouts	2022-11-02 17:23:52 +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	4ac3650d64	Merge remote-tracking branch 'origin/develop'	2022-09-14 18:21:40 -07:00
snipe	9b5790b7e6	Merge pull request #11072 from snipe/fixes/support_apache_24 ... YOLO	2022-09-12 14:26:43 -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	a92bb80055	Upgraded jquery-UI ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-18 17:27:54 -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	d458973649	Removed unneeded JS ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 15:58:37 -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	937472feb0	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json	2022-05-18 13:37:31 -07:00
snipe	f14a4d3bc7	Recompiled dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 13:35:38 -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	3dc4f56fb4	Update constraints to allow up to 8.2 ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 17:23:41 -07:00
snipe	157944b774	Try conditiinal formatting to support apache 2.2 and 2.4 ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 18:01:06 -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
Brady Wetherington	35450aebdd	Update Livewire assets, and make Composer auto-update Livewire assets as needed	2022-05-11 14:00:10 -07:00
snipe	5dfdf73e01	Dev assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 17:28:06 -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
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end ... Cleaning up routes to match laravel-scim-server's recommended implementation Some actually *working* changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
snipe	80dff41c00	Merge pull request #10843 from ahpaleus/features/add_codeql_to_sdlc ... [Feature] Adds CodeQL to the SDLC process	2022-03-29 12:07:44 +01:00
Maciej Domanski	e09516d69b	codeql sa	2022-03-17 12:10:44 +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
snipe	84aa26dd50	Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu ... Fixed #10191 - font color contrast on mobile menu	2022-03-10 13:02:45 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
Godfrey M	14bd07e97d	gerge branchevelop' into gh10191-css-dropdownmenu	2022-03-03 10:14:30 -08:00
Godfrey M	4435ea95fd	removes changes to mix-manifest	2022-03-03 09:47:11 -08:00
Godfrey M	f115385243	C&P mix-manifest to be tracked	2022-03-03 09:32:05 -08:00
Godfrey M	708dc08b4f	mixes color contrast on dropdown menu from navbar ... on file	2022-03-03 09:27:52 -08:00
snipe	ed43d36895	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 14:47:09 -08:00
snipe	24ce34c8d7	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 14:19:27 -08:00
snipe	bf194d7794	Regenerate JS assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 14:43:30 -08:00
snipe	99c4fd8f84	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 18:56:18 -08:00
snipe	ee47a02792	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-21 12:33:49 -08:00
snipe	0721ab8bbf	Regenerated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-20 11:01:04 -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	c3d55ee27e	Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
Brady Wetherington	5fb05d8b1c	Change the [END] directive in .htaccess to [L] ... This allows backwards-compatibility with older Apache versions (which we _used_ to have), and should do the exact same thing.	2021-11-17 15:29:51 -08:00
snipe	174d23a42a	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:29:57 -08:00
snipe	f2f8f96991	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # 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/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php	2021-11-15 19:24:38 -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
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