Godfrey M
|
bbd04f8876
|
adds the rest of the fields for Remote
|
2022-12-06 11:13:24 -08:00 |
|
snipe
|
1377725a97
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-27 14:53:47 -07:00 |
|
|
snipe
|
58ccfe9226
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
# 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 <snipe@snipe.net>
|
2022-09-27 14:47:54 -07:00 |
|
|
snipe
|
0889cd61cf
|
Updated skins
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-27 14:47:09 -07:00 |
|
|
snipe
|
de399a9f8f
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2022-09-27 14:46:30 -07:00 |
|
|
snipe
|
942eaac2ee
|
Upgraded fontawesome
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-27 14:25:44 -07:00 |
|
|
snipe
|
421c9baecc
|
# Conflicts:
Signed-off-by: snipe <snipe@snipe.net>
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2022-09-15 20:11:07 -07:00 |
|
|
snipe
|
07e0fec1de
|
Downgraded BS Tables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 20:05:29 -07:00 |
|
|
snipe
|
a8a00f0a79
|
Updated prod JS assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-12 11:08:29 -07:00 |
|
|
snipe
|
448aefac28
|
Updated compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-12 10:54:54 -07:00 |
|
|
snipe
|
ab60fa08df
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 16:38:11 -07:00 |
|
|
snipe
|
0d656e3963
|
Production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-18 17:29:37 -07:00 |
|
|
snipe
|
50ce471dc6
|
Production assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2022-07-18 17:29:29 -07:00 |
|
|
snipe
|
a92bb80055
|
Upgraded jquery-UI
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-18 17:27:54 -07:00 |
|
|
snipe
|
3a6c6d8466
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-07 14:40:39 -07:00 |
|
|
snipe
|
b98af0f50f
|
Upgrade font-awesome to v6
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-07 14:22:08 -07:00 |
|
|
snipe
|
3a8786fdb7
|
Updated assets for prod
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 18:27:31 -07:00 |
|
|
snipe
|
4b9ec9218d
|
Upgraded/updates assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-22 15:54:58 -07:00 |
|
|
snipe
|
a758e825ed
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 13:45:33 -07:00 |
|
|
snipe
|
7cd35a80b6
|
Updated assets for production
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:52:47 -07:00 |
|
|
snipe
|
eaecf8137a
|
Updated assets for develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 19:52:27 -07:00 |
|
|
snipe
|
937472feb0
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# 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 <snipe@snipe.net>
|
2022-05-18 13:35:38 -07:00 |
|
|
snipe
|
4b21d9e7f4
|
Rebuild production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 11:13:18 -07:00 |
|
|
snipe
|
3bf2328db2
|
Regenerated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 11:11:34 -07:00 |
|
|
snipe
|
bf028adcc3
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-17 19:33:50 -07:00 |
|
|
snipe
|
be5be7a8b9
|
Bumped packages
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-17 19:30:57 -07:00 |
|
|
snipe
|
ce5ae80755
|
Regenerated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:44:51 -07:00 |
|
|
snipe
|
c0868a68fb
|
Removed console.log cruft
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:44:38 -07:00 |
|
|
snipe
|
13d81f0a0c
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:55:19 -07:00 |
|
|
snipe
|
5dfdf73e01
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 17:28:06 -07:00 |
|
|
snipe
|
784bf4d784
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# 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 <snipe@snipe.net>
|
2022-05-05 12:22:20 -07:00 |
|
|
snipe
|
809fe7f6d8
|
Compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 19:28:58 +01:00 |
|
|
snipe
|
5314ef97e5
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-11 15:08:39 +01:00 |
|
|
snipe
|
54d6a4d978
|
Fixed #10825 - selectlists in modals b0rked
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 08:23:50 -07:00 |
|
|
snipe
|
b876d0abb0
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
|
2022-03-03 21:59:38 -08:00 |
|
|
snipe
|
ed43d36895
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-24 14:47:09 -08:00 |
|
|
snipe
|
24ce34c8d7
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-24 14:19:27 -08:00 |
|
|
snipe
|
bf194d7794
|
Regenerate JS assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 14:43:30 -08:00 |
|
|
snipe
|
99c4fd8f84
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-01 18:56:18 -08:00 |
|
|
snipe
|
ee47a02792
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-21 12:33:49 -08:00 |
|
|
snipe
|
0721ab8bbf
|
Regenerated production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-20 11:01:04 -08:00 |
|
|
snipe
|
43c57c8461
|
Merge master into develop
Signed-off-by: snipe <snipe@snipe.net>
# 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 <snipe@snipe.net>
|
2021-12-24 12:30:34 -08:00 |
|
|
snipe
|
f4ef828332
|
Fixex js table export
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-24 11:17:36 -08:00 |
|
|
snipe
|
312200bf44
|
Removed duplicate "department" entry in importer, pulls #10460 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-21 13:37:20 -08:00 |
|
|
snipe
|
174d23a42a
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:29:57 -08:00 |
|