Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
snipe
|
02862d80eb
|
Updated dev assets
Signed-off-by: snipe <[email protected]>
|
2024-03-06 20:04:31 +00:00 |
|
|
snipe
|
0042359e5f
|
Prod assets
Signed-off-by: snipe <[email protected]>
|
2024-02-05 17:23:30 +00:00 |
|
|
snipe
|
cf2e2bfbc1
|
Updated prod assets
Signed-off-by: snipe <[email protected]>
|
2024-02-05 17:23:21 +00:00 |
|
|
Brady Wetherington
|
f734e196e5
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-01-08 18:57:55 +00:00 |
|
|
snipe
|
012fe57ca1
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2024-01-05 15:16:14 +00:00 |
|
|
snipe
|
bbdc8383e1
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2024-01-03 23:17:44 +00:00 |
|
|
snipe
|
ec3c4674de
|
Updated prod assets
Signed-off-by: snipe <[email protected]>
|
2023-12-15 13:58:45 +00:00 |
|
|
Brady Wetherington
|
db400dffb5
|
Merge branch 'develop' into snipeit_v7_laravel10
Rebuild assets and re-install from npm
|
2023-10-16 20:13:59 +01:00 |
|
|
Brady Wetherington
|
7a5714cc85
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-10-03 20:37:17 +01:00 |
|
|
snipe
|
cfe6b07b3a
|
Updated prod assets
Signed-off-by: snipe <[email protected]>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-09-28 15:15:50 +01:00 |
|
|
snipe
|
bb7a41628a
|
Fixed #13662 - added clipboard.js
Signed-off-by: snipe <[email protected]>
|
2023-09-28 15:06:55 +01:00 |
|
|
Brady Wetherington
|
f5ff9b2208
|
Merge branch 'develop' into snipeit_v7 - 2023-06-12
|
2023-06-12 16:56:23 +01:00 |
|
|
snipe
|
924d0b25e8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>
# Conflicts:
# config/version.php
# 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-06-08 08:53:22 +01:00 |
|
|
snipe
|
14727700ab
|
Updated libraries and dev assets
Signed-off-by: snipe <[email protected]>
|
2023-06-08 08:48:18 +01:00 |
|
|
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 |
|
|
Brady Wetherington
|
a938009074
|
Rebuilt assets with new Node and node_modules and package.json
|
2023-05-01 18:06:51 -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
|
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
|
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
|
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
|
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
|
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
|
12df310449
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2021-09-24 02:16:58 -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 |
|
|
Brady Wetherington
|
dce1dd41c8
|
Regenerate assets after repairing Vue integration
|
2021-06-28 16:38:05 -07:00 |
|