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 |
|
Godfrey M
|
f199098a59
|
undid the color change for links, darkened the back-sub-alt
|
2021-06-23 16:29:21 -07:00 |
|
|
snipe
|
ff8fa6ec77
|
Production assets for better contrast in dark mode skins
|
2021-02-03 00:52:23 -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
|
75b8c3455c
|
Fixed #8609 - custom fieldsets not draggable anymore (regression)
|
2020-11-12 23:38:12 -08:00 |
|
|
snipe
|
1090b291c3
|
Updated node packages, reregnerated assets
|
2020-10-19 16:56:59 -07:00 |
|
|
snipe
|
b433b49469
|
Ficing webpack, CSS and JS (*whew* that sucked)
Signed-off-by: snipe <[email protected]>
|
2020-04-27 22:41:33 -07:00 |
|