snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00

Author	SHA1	Message	Date
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
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
snipe	9c8ca6af21	Squashed commit of the following: commit `e321aeabae` Merge: `8ec99ff43` `37568ae9e` Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.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/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.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/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.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 # routes/web/fields.php # tests/unit/UserTest.php commit `37568ae9ec` Merge: `01a832169` `32ad9050c` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit `32ad9050cf` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit `01a832169c` Merge: `bcad49ce7` `3c6883489` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit `3c6883489c` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit `bcad49ce79` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit `b5acca89d7` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit `e52919cf1b` Merge: `714576be4` `29f3a5c48` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit `29f3a5c48f` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit `134e8e6fb9` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit `714576be45` Merge: `b999c50a2` `512899294` Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit `5128992940` Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit `0291323502` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit `e0f6f9b839` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit `f1a6308002` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit `b999c50a2e` Merge: `9ca20e496` `e3906b245` Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit `e3906b245c` Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit `9ca20e4964` Merge: `e0644dbbf` `456a74d88` Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit `456a74d88c` Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit `799c059070` Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit `c62d43a778` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit `b725bd0fae` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit `e0644dbbf6` Merge: `5b6925b00` `004ecad05` Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit `5b6925b00c` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit `df17a859bf` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit `24c43056ba` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit `606b7e905d` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit `d73ddad477` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit `9a39cf721e` Merge: `7410b1683` `8994f3e15` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit `7410b16835` Merge: `e955c983a` `b09e7d19b` Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit `8994f3e15e` Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit `d23f1a77ca` Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit `e955c983a3` Merge: `2fa17ac18` `eed41e454` Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit `b09e7d19b3` Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit `2fa17ac185` Merge: `b90515437` `3b1e46f72` Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit `3b1e46f72b` Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit `0c1a1de2a2` Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit `20c9ae5818` Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit `eed41e4549` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit `b750f4754f` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit `c17a06792a` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit `4f76cc6cfb` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit `b905154373` Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit `daf748e531` Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit `799a93c46a` Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit `34aa12e229` Merge: `81a633288` `897757bd0` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit `897757bd04` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit `c7125c3937` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit `81a6332889` Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same types of data across licenses commit `6e563f6e4b` Merge: `5320f5c67` `7f69ae953` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit `5320f5c67c` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit `7f69ae953b` Merge: `c79f8c1ba` `17f6fbabf` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit `17f6fbabfa` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit `c79f8c1baf` Merge: `12c92e30b` `536401fe0` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit `e7a820f7c9` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit `12c92e30b7` Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit `fd10b755b0` Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit `dbbb7680d9` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit `cf0dd5bbad` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit `25e53d8c7f` Merge: `ec6ed256f` `89d433b41` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit `89d433b41a` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit `e2570ada6f` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit `45afe725a1` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit `536401fe0f` Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit `ec6ed256fb` Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit `2aaa7bed2d` Merge: `339bdddc3` `cc9f1577a` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit `cc9f1577a4` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit `ab1fe8be0c` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit `339bdddc38` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit `35b9cf4b70` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit `7ccb41371e` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit `2e60a457bf` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit `2390d2160b` Merge: `b42801f6a` `00b051b8c` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit `00b051b8c7` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit `05b3a9ad7e` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit `4fb880384f` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit `43042ad841` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit `a716382ac4` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit `36c8f7f4f1` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit `b42801f6ae` Merge: `de4934f21` `946129f20` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit `946129f206` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit `b941ef1e08` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit `d1aa11ec89` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit `de4934f21d` Merge: `af06e4205` `b10076b01` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commit `b10076b015` Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit `af06e42056` Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit `9a2440dc4b` Merge: `beae8efb2` `2ac1c1636` Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit `2ac1c1636c` Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit `004ecad059` Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit `beae8efb21` Merge: `d14ab7e3e` `9839e5e56` Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit `9839e5e566` Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit `d14ab7e3e1` Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commit `e7f74d94c1` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit `e97cf011b6` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit `ed23505054` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit `001e721530` Merge: `f88683766` `8210da6e8` Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit `8210da6e82` Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit `f88683766b` Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commit `e4385c0f8c` Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit `0550fe0ffa` Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit `7fb3a9b82c` Merge: `9a2ed804c` `ecb1e87fe` Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit `ecb1e87fe6` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit `f43df5f041` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit `95cc48e422` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit `9a2ed804ca` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commit `d20fad28e5` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commit `ae813ddf75` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit `bb42109c0c` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commit `f46ecf8ec0` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commit `b9e821c0e6` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit `9ee28c7513` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit `1a8ba06702` Merge: `0fd232e70` `ee4d69b1c` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit `0fd232e70d` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commit `ee4d69b1c5` Merge: `31c535094` `d1ad11194` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit `d1ad111949` Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit `31c5350941` Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit `7eb70e17e0` Merge: `5bb4f271a` `3dfcb4699` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit `3dfcb46991` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit `96eb96f964` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commit `a2f08bd3ba` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commit `e009fbe59f` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit `5bb4f271aa` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>	2020-08-31 12:17:19 -07:00
snipe	53c46ac8de	Fixed stupid import layouts	2020-08-24 21:15:46 -07:00
snipe	6a089f86f8	Fixed pathing for accessories	2020-08-03 11:17:56 -07:00
snipe	c17a06792a	Added address, city, state, country to user importer	2020-07-21 16:49:38 -07:00
Brady Wetherington	145dfe5847	Rebuild assets	2020-07-16 15:36:10 -07:00
Brady Wetherington	17f6fbabfa	Switch to 'items' to maintain compatbility with other internal API's	2020-07-13 21:12:03 -07:00
Brady Wetherington	318da67230	Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5	2020-07-13 17:43:15 -07:00
Brady Wetherington	e7a820f7c9	Changes how we do AJAX calls via Select2 for dynamic drop-down menus	2020-07-13 17:14:31 -07:00
snipe	d1aa11ec89	Fix for weird padlock display in asset listing with encrypted custom fields	2020-06-22 20:29:19 -07:00
Daniel Meltzer	1321304720	Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses.	2020-05-12 14:38:21 -04:00
snipe	730632e2eb	Apply PR #8043 to develop Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 22:57:55 -07:00
snipe	ecb1e87fe6	Updated assets Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:45:15 -07:00
snipe	95cc48e422	Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:41:10 -07:00
snipe	412caebf69	Fixed logo uploads Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 23:22:52 -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	c50b81ff19	Added resources Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:15:24 -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	edc29bf6d5	Moved font-awesome fonts to make life easier Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 03:33:14 -07:00
snipe	6103524ebc	Moved skins into css/dist directory Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 03:32:52 -07:00
snipe	905fb09c5b	Removed unused light skins	2020-04-22 01:56:22 -07:00
snipe	63259418b2	Package updates	2020-04-21 10:43:25 -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	b670371e0b	Ugggh… fixing a donked merge	2020-04-21 03:30:21 -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

... 3 4 5 6 7 ...

707 commits