Commit graph

95 commits

Author SHA1 Message Date
snipe 03233465c7 Updated webpack, added new dev assets
Signed-off-by: snipe <[email protected]>
2023-06-08 08:10:12 +01:00
snipe d7f4fa146b Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-05-24 16:02:28 -07:00
snipe cc07921608 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-05-24 15:59:52 -07:00
snipe 1f5e4309fa Updated webpack, new asset files
Signed-off-by: snipe <[email protected]>
2023-05-10 11:20:06 -07:00
snipe c683233aa3 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/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
2023-04-06 15:00:38 -07:00
snipe 3bd87a2785 Removed iCheck
Signed-off-by: snipe <[email protected]>
2023-04-03 22:52:54 -07:00
snipe 4035cd118e Handle the column selector in bs table styling
Signed-off-by: snipe <[email protected]>
2023-04-03 14:35:47 -07:00
snipe 58ea1592bb Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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
snipe ac0b22d696 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-03-08 00:33:04 -08:00
snipe 5defd5ec0a Merge develop into master
Signed-off-by: snipe <[email protected]>
2023-03-07 19:59:17 -08:00
snipe 383b5b43bb Added a few more jquery options for prevoew flexibility
Signed-off-by: snipe <[email protected]>
2023-03-07 18:54:38 -08:00
snipe c7fb542dc3 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2023-03-06 14:28:04 -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 b89979fbec Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2022-12-14 16:41:56 -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 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 942eaac2ee Upgraded fontawesome
Signed-off-by: snipe <[email protected]>
2022-09-27 14:25:44 -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 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 a92bb80055 Upgraded jquery-UI
Signed-off-by: snipe <[email protected]>
2022-07-18 17:27:54 -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 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 937472feb0 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2022-05-18 13:35:38 -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 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 5dfdf73e01 Dev assets
Signed-off-by: snipe <[email protected]>
2022-05-10 17:28:06 -07:00
snipe 809fe7f6d8 Compiled assets
Signed-off-by: snipe <[email protected]>
2022-04-12 19:28:58 +01:00
snipe 54d6a4d978 Fixed #10825 - selectlists in modals b0rked
Signed-off-by: snipe <[email protected]>
2022-03-16 08:23:50 -07:00
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <[email protected]>

# 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
snipe ed43d36895 Updated assets
Signed-off-by: snipe <[email protected]>
2022-02-24 14:47:09 -08:00
snipe 24ce34c8d7 Updated assets
Signed-off-by: snipe <[email protected]>
2022-02-24 14:19:27 -08:00
snipe bf194d7794 Regenerate JS assets
Signed-off-by: snipe <[email protected]>
2022-02-09 14:43:30 -08:00
snipe 99c4fd8f84 Updated assets
Signed-off-by: snipe <[email protected]>
2022-02-01 18:56:18 -08:00
snipe ee47a02792 Updated assets
Signed-off-by: snipe <[email protected]>
2022-01-21 12:33:49 -08:00
snipe 0721ab8bbf Regenerated production assets
Signed-off-by: snipe <[email protected]>
2022-01-20 11:01:04 -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