DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
14858 commits 96 branches 267 tags 295 MiB
Commit graph

168 commits

Author SHA1 Message Date
snipe 2c47b63e91 Small tweaks to overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:37:07 -07:00
snipe c05ee5db0e Built assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:54 -07:00
snipe 4035cd118e Handle the column selector in bs table styling 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 14:35:47 -07:00
snipe e066f033c8 First attempt at moving us away from iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 10:54:01 -07:00
snipe dbe0a3352b Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-02-28 20:34:20 -08:00
snipe f9b5a67dc2 Compiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:08 -08:00
snipe 05a3f20d51 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:55:59 -08:00
snipe 0080ac92e7 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:52:06 -08:00
snipe 91d0c383df Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:47:55 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
snipe c8baf4c6ad Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:25:43 -07:00
snipe ecc6bd8a24 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:24:31 -07:00
snipe da40c0ad48 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 18:09:18 -07:00
snipe 1377725a97 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:53:47 -07:00
snipe 0924d2144b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-09-15 21:47:14 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe a8a00f0a79 Updated prod JS assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 11:08:29 -07:00
snipe ab60fa08df Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 16:38:11 -07:00
snipe 6f1f6c75e6 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-07-15 17:11:55 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 30c03435e4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-07-07 16:01:17 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -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 f4c346a57c Small fixes to default blue skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:11:42 -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 5fe1078013 Squashed commit of the following: 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

    Signed-off-by: snipe <snipe@snipe.net>

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:54:18 -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 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 13d81f0a0c Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 11:55:19 -07:00
snipe ee47a02792 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-21 12:33:49 -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
snipe 303fc39966 Regenerated assets to pikc up #10089 changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 14:38:17 -08: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 05c6254fdc Updated snipeit.js with "restore" modal code 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-09 22:39:33 -08:00
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 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
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 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 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
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 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
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 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 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 453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master 
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	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
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php
 2020-08-31 12:44:03 -07:00
snipe d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields 2020-06-22 20:29:19 -07:00
snipe 95cc48e422
Added option to disable backup in import 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:41:10 -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 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 3016dcc616 WIP 2018-09-28 17:30:52 -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