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 |
|
|
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
|
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
|
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 |
|
|
snipe
|
72a1616b3c
|
Removed wonky assets
Signed-off-by: snipe <[email protected]>
|
2020-04-27 21:02:42 -07:00 |
|
|
snipe
|
756361584a
|
Updated assets
|
2019-08-14 22:22:33 -07:00 |
|
Wes Hulette
|
bfb5920677
|
Added #5956 - Moved bootstrap-tables to npm (#6139)
Created single bootstrap-tables js and css file.
|
2018-08-28 13:10:27 -07:00 |
|