Commit graph

66 commits

Author SHA1 Message Date
snipe b1fda46e11 Production assets
Signed-off-by: snipe <[email protected]>
2023-05-10 11:25:28 -07:00
snipe 1f5e4309fa Updated webpack, new asset files
Signed-off-by: snipe <[email protected]>
2023-05-10 11:20:06 -07:00
snipe 5950ec27ab Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
2023-05-03 13:49:36 -07:00
snipe 577fff7d65 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-05-03 10:45:36 -07:00
snipe 9a73f5eca3 Updated production assets
Signed-off-by: snipe <[email protected]>

# 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 2b10357c4e Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-04-17 19:06:27 -07:00
snipe b29276579f Updated prod assets
Signed-off-by: snipe <[email protected]>
2023-02-28 20:34:31 -08:00
snipe dbe0a3352b Updated prod assets
Signed-off-by: snipe <[email protected]>

# 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 05a3f20d51 Updated production assets
Signed-off-by: snipe <[email protected]>
2023-01-19 15:55:59 -08:00
snipe 0080ac92e7 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-01-19 15:52:06 -08:00
snipe 97731cd7c8 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json
2022-12-05 16:34:34 -08:00
Godfrey M 371a5bf4d6 changes the icon color with themes 2022-11-30 10:37:47 -08:00
snipe c8baf4c6ad Updated prod assets
Signed-off-by: snipe <[email protected]>
2022-10-12 16:25:43 -07:00
snipe 1377725a97 Dev assets
Signed-off-by: snipe <[email protected]>
2022-09-27 14:53:47 -07:00
snipe 58ccfe9226 Updated prod assets
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2022-09-27 14:47:54 -07:00
snipe 0889cd61cf Updated skins
Signed-off-by: snipe <[email protected]>
2022-09-27 14:47:09 -07:00
snipe de399a9f8f Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 a8a00f0a79 Updated prod JS assets
Signed-off-by: snipe <[email protected]>
2022-09-12 11:08:29 -07:00
snipe ab60fa08df Updated dev assets
Signed-off-by: snipe <[email protected]>
2022-08-24 16:38:11 -07:00
snipe 8b03abde8d Production assets for dark skin fix
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2022-07-22 15:36:51 -07:00
snipe 0d656e3963 Production assets
Signed-off-by: snipe <[email protected]>
2022-07-18 17:29:37 -07:00
snipe 50ce471dc6 Production assets
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
2022-07-18 17:29:29 -07:00
snipe 3a6c6d8466 Prod assets
Signed-off-by: snipe <[email protected]>
2022-07-07 14:40:39 -07:00
snipe b98af0f50f Upgrade font-awesome to v6
Signed-off-by: snipe <[email protected]>
2022-07-07 14:22:08 -07:00
snipe 18c37c97b8 Dark skin prod assets
Signed-off-by: snipe <[email protected]>
2022-06-23 19:14:12 -07:00
snipe 3a8786fdb7 Updated assets for prod
Signed-off-by: snipe <[email protected]>
2022-06-23 18:27:31 -07:00
snipe a758e825ed Dev assets
Signed-off-by: snipe <[email protected]>
2022-06-15 13:45:33 -07:00
snipe 7cd35a80b6 Updated assets for production
Signed-off-by: snipe <[email protected]>
2022-06-13 20:52:47 -07:00
snipe eaecf8137a Updated assets for develop
Signed-off-by: snipe <[email protected]>
2022-06-13 19:52:27 -07:00
snipe 4b21d9e7f4 Rebuild production assets
Signed-off-by: snipe <[email protected]>
2022-05-18 11:13:18 -07:00
snipe 3bf2328db2 Regenerated dev assets
Signed-off-by: snipe <[email protected]>
2022-05-18 11:11:34 -07:00
snipe bf028adcc3 Updated production assets
Signed-off-by: snipe <[email protected]>
2022-05-17 19:33:50 -07:00
snipe be5be7a8b9 Bumped packages
Signed-off-by: snipe <[email protected]>
2022-05-17 19:30:57 -07:00
snipe ce5ae80755 Regenerated assets
Signed-off-by: snipe <[email protected]>
2022-05-13 13:44:51 -07:00
snipe c0868a68fb Removed console.log cruft
Signed-off-by: snipe <[email protected]>
2022-05-13 13:44:38 -07:00
snipe 13d81f0a0c Updated prod assets
Signed-off-by: snipe <[email protected]>
2022-05-13 11:55:19 -07:00
snipe 54d6a4d978 Fixed #10825 - selectlists in modals b0rked
Signed-off-by: snipe <[email protected]>
2022-03-16 08:23:50 -07:00
snipe ee47a02792 Updated assets
Signed-off-by: snipe <[email protected]>
2022-01-21 12:33:49 -08:00
snipe 43c57c8461 Merge master into develop
Signed-off-by: snipe <[email protected]>

# 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 8be6d10dbe Fixed #10467 - Safari only font-awesome bug
Signed-off-by: snipe <[email protected]>
2021-12-24 12:30:34 -08:00
snipe f4ef828332 Fixex js table export
Signed-off-by: snipe <[email protected]>
2021-12-24 11:17:36 -08:00
snipe 8738451685 Fixed font awesome caret
Signed-off-by: snipe <[email protected]>
2021-09-25 23:17:35 -07:00
snipe 8d1c3106b5 Building assets again
Signed-off-by: snipe <[email protected]>
2021-09-24 11:13:15 -07:00
snipe 12df310449 Updated assets
Signed-off-by: snipe <[email protected]>
2021-09-24 02:16:58 -07:00
snipe c970464690 Updated production assets
Signed-off-by: snipe <[email protected]>
2021-08-18 00:48:05 -07:00
snipe f99602c039 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 60b8320b4b Updated production assets
Signed-off-by: snipe <[email protected]>
2021-07-06 15:15:28 -07:00
snipe 11d9b1ba45 Updated assets
Signed-off-by: snipe <[email protected]>
2021-07-06 15:09:03 -07:00