snipe
3951de1669
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you
2021-10-28 17:13:37 -07:00
snipe
4a98519c1f
Compiled assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-12 12:30:25 -07:00
snipe
43a437000b
Slightly better right-padding on row-new-striped
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-29 11:20:32 -07:00
snipe
9a83b90e44
Make row-new-striped 100% width
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 15:04:57 -07:00
snipe
8738451685
Fixed font awesome caret
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 23:17:35 -07:00
snipe
a9b306f2d2
Backing out the ribbon - too finicky on mobile :(
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 14:30:29 -07:00
snipe
8d1c3106b5
Building assets again
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 11:13:15 -07:00
snipe
dbe93d91cd
Updated fontawesome icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:07:46 -07:00
snipe
383c2c8466
New assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 04:12:55 -07:00
snipe
9a299973ff
Mobile CSS overrides
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 03:02:19 -07:00
snipe
12df310449
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 02:16:58 -07:00
snipe
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
Godfrey M
160017c720
more deadspace
2021-09-21 19:28:39 -07:00
Godfrey M
941cba73b9
removed deadspace and unnecessary css changes
2021-09-21 19:27:17 -07:00
Godfrey M
4a0c8de82a
adds jquery eventlistner to monitor chart.js width and refresh accordingly
2021-09-21 19:13:09 -07:00
snipe
c970464690
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:48:05 -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
snipe
33e92c975a
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# 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-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-07-15 13:29:00 -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
d037ec5b9c
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 18:08:50 -07:00
Godfrey M
a37edd5c5b
darkened back-sub-alt more
2021-06-23 16:34:41 -07:00
Godfrey M
f199098a59
undid the color change for links, darkened the back-sub-alt
2021-06-23 16:29:21 -07:00
Brady Wetherington
5b42481d8f
Get it so that we can re-build assets.
2021-06-11 21:54:29 -07:00
snipe
67ac3631df
Production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-04 22:05:26 -07:00
snipe
a1bc984d17
Generate production assets, bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:34:02 -07:00
snipe
d5894a4d64
Generated dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:27:28 -07:00
snipe
ce1d3284b0
Buld assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 10:12:14 -07:00
Brady Wetherington
bf344fd707
Merge branch 'develop'
...
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
2021-04-14 09:58:21 -07:00
snipe
7ddcc97e79
Generated dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 20:35:58 -07:00
Brady Wetherington
6b86e2a58f
Rebuilt all assets after all commits had landed
2021-04-06 20:16:59 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
Joel Pittet
af8509c4d0
Allow NPM packages to build for production ( #9171 )
...
* add back changes before compiling assets
* new css location and mix manifest
* update papaparse, most vunerabilities attached to it
* update axios and papaparse for security releases
* removing security fixes that still allow npm run production to work
* Update lodash
2021-04-05 22:01:11 -07:00
snipe
77ec64aded
Merge remote-tracking branch 'origin/develop'
...
# 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
2021-03-02 12:33:18 -08:00
Godfrey Martinez
b0078ff64d
Audit dark mode theme skins and check for [ch15847] ( #9102 )
...
Co-authored-by: snipe <snipe@snipe.net>
2021-02-25 19:41:31 -08: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
785bc40d9d
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-yellow.css
# public/mix-manifest.json
2021-02-17 13:50:14 -08:00
Godfrey Martinez
8fb97da314
Color of asset selection in bulk checkout [ch15525] ( #9145 )
2021-02-17 12:56:26 -08:00
snipe
3dc67cdba6
Updated dark skins with compiled assets for prod
2021-02-03 15:20:26 -08:00
snipe
0bbe0c85d7
Small improvement to topnav dropdown text colors in dark skins
2021-02-03 15:17:31 -08:00
snipe
721add5bc1
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# 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
2021-02-03 00:57:58 -08:00
snipe
ff8fa6ec77
Production assets for better contrast in dark mode skins
2021-02-03 00:52:23 -08:00
snipe
e0a6f22489
Small fixes to dark mode skins
2021-02-03 00:49:09 -08:00
Godfrey Martinez
cf368a4577
fixed an issue with links colors ( #9073 )
...
* fixed an issue with links colors
* corrected btn-default's color
2021-02-01 13:50:37 -08:00
Godfrey Martinez
0dc78fdea6
fixed color schema on dark mode skins for links ( #9034 )
2021-01-21 14:41:42 -08:00
Godfrey Martinez
444f9a81da
Bug/ch15603/read only text field in saml screen dark ( #8993 )
...
* fixed dark mode skins read only color schema
* fixed dark mode skins read only color schema
2021-01-11 14:07:55 -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
8890372a69
Production assets with dark skin fixes
2020-11-11 14:47:13 -08:00
Godfrey Martinez
80f2d749a2
Corrected css to the bootstrap popovers for all dark mode skins ( #8714 )
...
* added css to the bootstrap popovers in dark blue
* corrects the tool tips css for all dark mode skins other than dark blue
2020-11-11 14:11:39 -08:00
snipe
d317052ede
Updated CSS assets with green skin edits
2020-10-23 18:55:00 -07:00
snipe
1090b291c3
Updated node packages, reregnerated assets
2020-10-19 16:56:59 -07:00
snipe
e750b2b2da
Added envelope css to overrides for table header
2020-09-11 16:06:19 -07:00
snipe
7cab9f48e5
Use darker red for errors
2020-08-31 19:40:49 -07:00
snipe
3613da3685
Fixed dashboard boxes
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:05:04 -07:00
snipe
b433b49469
Ficing webpack, CSS and JS (*whew* that sucked)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 22:41:33 -07:00
snipe
72a1616b3c
Removed wonky assets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 21:02:42 -07:00
snipe
88d39b4287
Updated generated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:46:41 -07:00
snipe
94e8343f63
Generated skins in css/dist/skins
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:13:09 -07:00
snipe
a160da6619
Removed unused styles
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:11:38 -07:00
snipe
a44d1cc0cf
Fixed iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:02:55 -07:00
snipe
e1784394b3
Moved js, skins and primary CSS into dist directory
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:39:42 -07:00
snipe
381d2369b6
Updated CSS assets
2020-04-21 06:33:44 -07:00
snipe
58f6b2da5a
Fixing assets
2020-04-21 03:42:35 -07:00
snipe
f532e9b462
Fixing assets :(
...
Not sure what happened in tbis merge exactly
2020-04-21 03:07:11 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
0858fec7f1
Fixed CSS issue where text-only logos at the top would be the wrong color
2020-04-08 17:24:38 -07:00
snipe
824ebc19c0
Updated assets
2020-04-08 11:24:17 -07:00
snipe
0d3c18d1df
Fixed importer vue code for niceer layout
2020-04-06 15:09:37 -07:00
snipe
756361584a
Updated assets
2019-08-14 22:22:33 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
snipe
dee92cfc6c
Fixes XSS vulnerabilities ( #6831 )
...
* Properly escape log_meta values
* Vue syntax fix to allow npm run dev to work again
* Janky fix for Select2 bug
* Compiled production assets
* Escape user’s last name in API
* Removed duplicate alertClass
* Compiled production assets
2019-03-18 20:49:32 -07:00
snipe
3d4a5a8066
More importer tweaks for dept and manager
2018-11-07 18:05:53 -08:00
Wes Hulette
3c59452e33
Fixed Tooltips and Rounded corners from previous cleanup ( #6285 )
...
* Fixed missing oauth tables during setup.
* Fixed tooltip and square boxes
2018-10-03 13:17:08 -07:00
snipe
c8bff3ef38
Features/add manager and dept to importer ( #6277 )
...
* Ignore the simlink for public storage
* Added manager and department to user import
* More UI importer tweaks
* Fisxed typos
2018-10-02 15:43:54 -07:00
Wes Hulette
1742867df1
Removed inline signature.css
...
Added to webpack
2018-10-01 08:20:31 -04:00
Wes Hulette
11f128a84f
Moved chart.js library into vendor.js
2018-09-28 17:28:49 -04:00
Wes Hulette
991a00b38f
Updated pGenerator jQuery Plugin to v1.0.5
2018-09-28 17:27:34 -04:00
Wes Hulette
b84eb836f4
Cleaned up JS
...
Removed unnecessary JS files
Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.
2018-09-28 17:27:06 -04:00
Wes Hulette
ecf77e60df
Added: #6246 - CSS Cleanup ( #6247 )
...
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Removed override.less
* Moved bootstrap-color-picker css to file
Removed inline calls
* Changed css import on setup.blade.php
* Updated signature-pad.css import
* NPM Prod compile
* Fixed font family loading issue.
2018-09-28 14:09:48 -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
Daniel Meltzer
2637ce56a1
Allow importcontroller to return 200 for failed delete. ( #6034 )
2018-08-02 09:53:54 -07:00
snipe
462878a307
Production assets
2018-08-01 00:27:19 -07:00
snipe
8732f299e6
Added logo class for logo override in custom CSS
2018-07-02 18:47:30 -07:00
snipe
f5bf6a0beb
Added larger icon size
2018-05-01 21:34:31 -07:00
Hannah Tinkler
c4c520c1a3
Fixes #4445 : prevents assigned assets from being checked out in bulk checkout ( #5421 )
...
* Fixes #4445 : prevents assigned assets from being checked out in bulk checkout
* Updates data attribute to more versatile 'data-asset-status-type'
* Fixes broken unit test
2018-04-25 02:39:23 -07:00
Hannah Tinkler
8d501e1c24
Feature/custom fields default values ( #5389 )
...
* Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection.
Have tested extensively and doesn't seem to affect anywhere else?
* Adds default value functionality
* Adds built assets
* Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work
* Updates built assets
* Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377 )
* Added department to custom asset export
Updates build assets
* Adds translation support for 'add default values' checkbox label
2018-04-23 21:16:55 -07:00
snipe
d2403cdadb
Added image preview for uploads
2018-02-17 00:51:22 -08:00
snipe
3744a68daf
Features/better table options ( #5018 )
...
* Added CSS for table toolbar
* Use maintenances API for table listings
* NIcer layout for allowed_columns in maintenances API
* Fixed #5014 - bootstrap cookie issues
* Fixed #5015 - bug when saving settings
* Refactored datatable code to use data attributes
* Updated dashboard with new table code
* Added - Order by group user count
* Updated groups to use new table attributes
* New license listing table code
* More bootstrap table implementations
* More BS table refactoring
* Improved bootstrap assigned assets
* New bootstrap for reports
* Misc BS fixes
* FIxed small issue with asset history display
* Removed multisort option
* JS refactor
2018-02-16 13:22:55 -08:00
snipe
b6a7fd1cec
Run production assets - because modern web development. Sigh.
2018-01-09 20:18:49 -08:00
Daniel Meltzer
f16ce09a7a
Importer again ( #4702 )
...
* If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it.
* Fix build of vue files. The location is public/js/build, not public/build
* Ensure a status type is set before allowing submission of an import.
Also expand the status text label to change color based on success/failure.
Fixes #4658
* Use right key to lookup emails when importing users. Fixes 4619.
* Import serial for components, and make unique matches based on the serial as well as the name. Fixes #4569
* Set the location_id when importing an item properly.
This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot.
Fixes #4563 (I think)
* Production assets.
* Case insensitive field map guessing and repopulate when changingin import type.
2017-12-28 20:08:45 -08:00
snipe
023910472c
Fixes #2415 - only allow gif, png jpg, svg image uploads
2017-12-06 14:33:52 -08:00
snipe
a4323a0308
Fixed #4559 - min width for checkin/checkout buttons
2017-12-04 19:57:15 -08:00
snipe
ee9a229c0e
Added datepicker range CSS
2017-12-01 14:26:01 -08:00
snipe
6e2556eefd
Production assets
2017-11-08 02:24:06 -08:00
snipe
e5c1e41966
Nicer icheck for user menu
2017-11-08 01:52:35 -08:00
snipe
f3f84f1a8c
Production assets
2017-10-28 11:22:38 -07:00
snipe
82690e1fd7
Integrate ajax select2 menus in all asset checkouts
2017-10-26 02:28:17 -07:00
snipe
4f80eac467
Prod assets
2017-10-25 20:15:34 -07:00
snipe
dc9a908de7
Fixing laravel mix() fuckery, hopefully for the last time
2017-10-25 18:13:03 -07:00
snipe
e1ad28aa20
Mix fuckery
2017-10-25 16:05:39 -07:00
snipe
87992b7f71
More mix() fuckery
2017-10-25 16:05:18 -07:00
snipe
8d68bb7a57
Sticky headers for bootstrap tables
2017-10-24 05:22:26 -07:00
snipe
66596b0b09
Production assets
2017-10-16 20:12:22 -07:00
snipe
7455b1019a
Hacky possible fix for subdir issues
2017-10-16 20:12:11 -07:00
madd15
e2bac62e36
Fix #4205 ( #4213 )
...
* Fixing various UI items
* Revert css change
* Dashboard icon CSS up 4px
2017-10-14 00:14:22 -07:00
Daniel Meltzer
a2453be573
Pass urls to passport vue components to make work in subdirectories. ( #4090 )
2017-10-01 13:59:07 -07:00
Daniel Meltzer
c2616412c0
Add laravel routes to javascript ( #4092 )
...
* Add laravel routes to javascript
This will clean up a lot of passing of urls. Adds a route() helper and
everything...
This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.
* Try to fix travis unit test things.
* Downgrade doctrine/inflector for php5
* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.
* Update sql dump for functional tests.
* Try to fix api tests.
2017-10-01 12:59:55 -07:00
snipe
b7abd8328a
Prod asset build
2017-09-29 19:43:18 -07:00
Daniel Meltzer
655ca78633
Adjust the import controller to return a url to the process path to enable processing an uploaded file without refresh. ( #4080 )
2017-09-29 17:49:35 -07:00
Daniel Meltzer
0a4743210c
Pass urls to vue. Should fix subdirectory issues. ( #4054 )
2017-09-28 16:03:04 -07:00
snipe
348becbbec
Production assets generated
2017-09-18 13:01:54 -07:00
Daniel Meltzer
922d6937ae
Custom field import repair ( #3968 )
...
* There is no notes field on accessories. Fixes Importer Test.
* Fix notification test. We should see a checkout not allowed exception when trying to check out to a location if the asset requires acceptance.
* Fix Custom field import.
Add a test for custom field import, and fix a few issues related to
importing custom fields. This will restore v3 functionality.
* Add UI support for mapping custom fields.
This still requires the field mappings to be created/assigned in
advance, but will fetch all custom field names and allow them to be
selected when setting up custom field mappings.
This commit also updates laravel-mix to v1.4.3 and other node
dependencies to fix some build issues.
* Fix some requestable asset page/assetloc issues. I'd love to know why laravel expections relationships to be in lower case... but thats a question for another day.
2017-09-18 12:29:08 -07:00
snipe
c7a21e0e4d
Production asset build
2017-08-26 17:39:59 -07:00
Brady Wetherington
6ad5da44f3
Formalize modals ( #3898 )
...
* Refactor Modal JS into standalone file, remove duplicated JS and HTML
* Finish fixing Bulk-checkout and checkout
2017-08-26 16:06:52 -07:00
snipe
e79260a0d4
Fixes #3732 - broken tooltips and weird select2 option text behavior
...
The solve here was a few things - first, load jquery-ui before bootstrap. They have conflicting tooltips. Second, initiate the tooltips in the wenzhixin/bootstrap-table formatter using `data-tooltip=“true”`, and thirdly, add some JS that tells BS table to inititalize tooltips within the table using that `data-tooltip=“true”` business
2017-07-08 13:21:13 -07:00
Daniel Meltzer
61c6160b98
Importer mapping - v1 ( #3677 )
...
* Move importer to an inline-template, allows for translations and easier passing of data from laravel to vue.
* Pull the modal out into a dedicated partial, move importer to views/importer.
* Add document of CSV->importer mappings. Reorganize some code.
Progress.
* Add header_row and first_row to imports table, and process upon uploading a file
* Use an expandable table row instead of a modal for import processing. This should allow for field mapping interaction easier.
* Fix import processing after moving method.
* Frontend importer mapping improvements.
Invert display so we show found columns and allow users to select an
importer field to map to. Also implement sample data based on first row
of csv.
* Update select2. Maintain selected items properly.
* Backend support for importing. Only works on the web importer currently. Definitely needs testing and polish.
* We no longer use vue-modal plugin.
* Add a column to track field mappings to the imports table.
* Cleanup/rename methods+refactor
* Save field mappings and import type when attempting an import, and repopulate these values when returning to the page.
* Update debugbar to fix a bug in the debugbar code.
* Fix asset tag detection.
Also rename findMatch to be a bit clearer as to what it does.
Remove logging to file of imports for http imports because
it eats an incredible amouint of memory.
This commit also moves imports out of the hardware namespace and into
their own webcontroller and route prefix, remove dead code from
AssetController as a result.
* Dynamically limit options for select2 based on import type selected, and group them by item type.
* Add user importer.
Still need to implement emailing of passwords to new users, and probably
test a bit more.
This also bumps the memory limit for web imports up as well, I need to
profile memory usage here before too long.
* Query the db to find user matches rather than search the array. Performance is much much better.
* Speed/memory improvements in importers.
Move to querying the db rather than maintaining an array for all
importers. Also only store the id of items when we import, rather than
the full model. It saves a decent amount of memory.
* Remove grouping of items in select2
With the values being set dynamically, the grouping is redundant. It
also caused a regression with automatically guessing/matching field
names. This is starting to get close.
* Remove debug line on every create.
* Switch migration to be text field instead of json field for compatibility with older mysql/mariadb
* Fix asset import regression matching email address.
* Rearrange travis order in attempt to fix null settings.
* Use auth::id instead of fetching it off the user. Fixes a null object reference during seeding.
2017-06-21 16:37:37 -07:00
Daniel Meltzer
30487bfee7
Fix importer vue issues. ( #3655 )
...
We currently depend on a "vue-strap" module to provide the modal dialog.
The default npm vue-strap is not compatible with vue2, so we need to use
a fork. Update package.json to reflect this. Probably makes sense to
move away from vue-strap in all my copious amounts of free time.
2017-06-12 15:24:49 -07:00
snipe
3046d7d33c
Fixes #3644 - broken datepicker
2017-06-09 18:53:19 -07:00
snipe
02edb74cdf
Style updates
2017-06-09 14:58:43 -07:00
snipe
408bb6476f
Removed some unneeded styles
2017-06-09 14:57:57 -07:00
snipe
e9dd119b9c
Fixes some vue styles
2017-06-09 02:06:10 -07:00
snipe
9caf045930
Production assets
2017-06-06 02:36:02 -07:00
snipe
03411a3ae8
Removed poop class, added comment to webpack file
2017-06-06 01:44:17 -07:00
snipe
01cc00c832
Fixing webpack. Again
2017-06-06 01:39:53 -07:00
snipe
9338b37b74
Try to fix the datepicker :(
...
Webpack has fucked everything. I hate everything.
2017-06-06 00:51:41 -07:00
snipe
ada2ac06f2
Minified all.css
2017-06-06 00:05:22 -07:00
snipe
9d948e8d23
Removed erroneous bower dir
2017-06-06 00:04:55 -07:00
snipe
66eaff739a
More npm/css/js updates
2017-05-31 12:34:05 -07:00
snipe
7b4b2d79cf
Moved CSS/JS/etc assets up one level
2017-05-31 10:31:56 -07:00
