Commit graph

68 commits

Author SHA1 Message Date
snipe 2a638e66f0 Added column re-ordering
Signed-off-by: snipe <[email protected]>
2023-09-15 21:53:34 +01:00
snipe 3ba8b60f54 Fixed regression that disabled sticky headers
Signed-off-by: snipe <[email protected]>
2023-09-15 20:28:28 +01:00
snipe c18349d75f Updated webpack
Signed-off-by: snipe <[email protected]>
2023-08-08 22:07:49 +01:00
snipe 7debf126d6 Dev assets
Signed-off-by: snipe <[email protected]>
2023-07-10 20:03:12 +01:00
snipe 1f5e4309fa Updated webpack, new asset files
Signed-off-by: snipe <[email protected]>
2023-05-10 11:20:06 -07:00
snipe 42f0975414 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
2023-04-25 22:19:27 -07:00
snipe 470a36a7c9 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-04-25 22:12:56 -07:00
snipe 46cce0115e Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
2023-04-16 05:46:26 -07:00
snipe 21f5d39fa1 Upgrade bootstrap-table from 1.20.2 to 1.21.3 (Formerly #12733)
Signed-off-by: snipe <[email protected]>
2023-04-16 05:43:42 -07:00
snipe 86b04c7294 Updated prod assets
Signed-off-by: snipe <[email protected]>
2023-04-15 20:50:36 -07:00
snipe 20ab412e1e Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-04-15 20:45:35 -07:00
snipe b29276579f Updated prod assets
Signed-off-by: snipe <[email protected]>
2023-02-28 20:34:31 -08:00
snipe 0080ac92e7 Updated dev assets
Signed-off-by: snipe <[email protected]>
2023-01-19 15:52:06 -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 07e0fec1de Downgraded BS Tables
Signed-off-by: snipe <[email protected]>
2022-09-15 20:05:29 -07:00
snipe 448aefac28 Updated compiled assets
Signed-off-by: snipe <[email protected]>
2022-09-12 10:54:54 -07:00
snipe ab60fa08df Updated dev assets
Signed-off-by: snipe <[email protected]>
2022-08-24 16:38:11 -07:00
snipe 0d656e3963 Production assets
Signed-off-by: snipe <[email protected]>
2022-07-18 17:29:37 -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 4b9ec9218d Upgraded/updates assets
Signed-off-by: snipe <[email protected]>
2022-06-22 15:54:58 -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 784bf4d784 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <[email protected]>

# 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 <[email protected]>
2022-05-05 12:22:20 -07:00
snipe 809fe7f6d8 Compiled assets
Signed-off-by: snipe <[email protected]>
2022-04-12 19:28:58 +01:00
snipe 5314ef97e5 Updated assets
Signed-off-by: snipe <[email protected]>
2022-04-11 15:08:39 +01: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
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 <[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 312200bf44 Removed duplicate "department" entry in importer, pulls #10460 to master
Signed-off-by: snipe <[email protected]>
2021-12-21 13:37:20 -08:00
snipe 174d23a42a Updated assets
Signed-off-by: snipe <[email protected]>
2021-11-15 19:29:57 -08:00
snipe fba0e2b712 Revert tableexport
(It broke the npm run prod build)

Signed-off-by: snipe <[email protected]>
2021-11-03 16:17:19 -07:00
snipe 12df310449 Updated assets
Signed-off-by: snipe <[email protected]>
2021-09-24 02:16:58 -07:00
snipe d069d032fc Updated JS asset
Signed-off-by: snipe <[email protected]>
2021-09-23 18:59:13 -07:00
snipe 11d9b1ba45 Updated assets
Signed-off-by: snipe <[email protected]>
2021-07-06 15:09:03 -07:00