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
|
809fe7f6d8
|
Compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-12 19:28:58 +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 |
|
|
snipe
|
f2f8f96991
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# 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/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
|
2021-11-15 19:24:38 -08:00 |
|
|
snipe
|
05c6254fdc
|
Updated snipeit.js with "restore" modal code
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 22:39:33 -08:00 |
|
|
snipe
|
fba0e2b712
|
Revert tableexport
(It broke the npm run prod build)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-03 16:17:19 -07:00 |
|
|
snipe
|
4a98519c1f
|
Compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-12 12:30:25 -07:00 |
|
|
snipe
|
f306401e7e
|
Fixed SVG XSS vuln
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-06 12:26:45 -07:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
8738451685
|
Fixed font awesome caret
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-25 23:17:35 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -07:00 |
|
|
snipe
|
12df310449
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 02:16:58 -07:00 |
|
|
snipe
|
919eaf320c
|
Updated javascript assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-23 19:00:53 -07:00 |
|
|
snipe
|
f99602c039
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# 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
|
f8562e5835
|
Recompiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:45:02 -07:00 |
|
Godfrey M
|
44612e5eb7
|
Make non linked striped text the same for [ch16602]
|
2021-07-14 14:50:45 -07:00 |
|
|
snipe
|
60b8320b4b
|
Updated production assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-07-06 15:15:28 -07:00 |
|
|
snipe
|
11d9b1ba45
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
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 |
|
|
snipe
|
9b2cb19f22
|
Fixed #9743 - Vue screens not loading
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-28 10:59:34 -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
|
1d43eda21f
|
Features: improved UI for importer (#9467)
* Small UI improvements for importer
Signed-off-by: snipe <snipe@snipe.net>
* And UI backup improvements
Signed-off-by: snipe <snipe@snipe.net>
|
2021-04-21 20:16:17 -07:00 |
|
|
snipe
|
ce1d3284b0
|
Buld assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-04-14 10:12:14 -07:00 |
|
|
Brady Wetherington
|
6b86e2a58f
|
Rebuilt all assets after all commits had landed
|
2021-04-06 20:16:59 -07:00 |
|
|
snipe
|
931e2df3bd
|
Updated production assets
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
|
2021-02-19 10:05:29 -08:00 |
|
|
snipe
|
7f8eddede6
|
Updated compiled assets
|
2021-02-19 10:02:30 -08:00 |
|