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
|
8738451685
|
Fixed font awesome caret
Signed-off-by: snipe <[email protected]>
|
2021-09-25 23:17:35 -07:00 |
|
|
snipe
|
8d1c3106b5
|
Building assets again
Signed-off-by: snipe <[email protected]>
|
2021-09-24 11:13:15 -07:00 |
|
|
snipe
|
12df310449
|
Updated assets
Signed-off-by: snipe <[email protected]>
|
2021-09-24 02:16:58 -07:00 |
|
|
snipe
|
c970464690
|
Updated production assets
Signed-off-by: snipe <[email protected]>
|
2021-08-18 00:48:05 -07:00 |
|
|
snipe
|
f99602c039
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-08-18 00:47:33 -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
|
67ac3631df
|
Production assets
Signed-off-by: snipe <[email protected]>
|
2021-05-04 22:05:26 -07:00 |
|
|
snipe
|
a1bc984d17
|
Generate production assets, bumped version
Signed-off-by: snipe <[email protected]>
|
2021-04-26 17:34:02 -07:00 |
|
|
snipe
|
d5894a4d64
|
Generated dev assets
Signed-off-by: snipe <[email protected]>
|
2021-04-26 17:27:28 -07:00 |
|