406 commits

Author	SHA1	Message	Date
snipe	ed43d36895	Updated assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 14:47:09 -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	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
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	c3d55ee27e	Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
Brady Wetherington	5fb05d8b1c	Change the [END] directive in .htaccess to [L] ... This allows backwards-compatibility with older Apache versions (which we _used_ to have), and should do the exact same thing.	2021-11-17 15:29:51 -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	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
Guillaume Lefranc	494ed3d17a	Exclude web.config from Apache	2021-10-11 14:14:00 +02:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about ... I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -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	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	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	932c1364ee	Added userpics from thispersondoesnotexist.com ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 22:05:42 -07:00
snipe	919eaf320c	Updated javascript assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 19:00:53 -07:00
snipe	d069d032fc	Updated JS asset ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 18:59:13 -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
Mike Frysinger	7b665ade0a	add rewrite rule for Let's Encrypt certificates ... The LE tools need access to a stable path to automatically obtain certificates, so add a rewrite rule to allow it.	2021-09-14 16:21:31 -04: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	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
snipe	eca15bd49b	Merge pull request #9837 from Godmartinz/chore/ch16531/update-demo-photos-of-iphones-to-be-more ... Update demo photos of iPhones to be more [ch16531]	2021-07-27 14:34:52 -07:00
Godfrey M	013e168883	adds newer versions of devices for demo	2021-07-21 15:12:27 -07:00
Godfrey M	9fb911146f	Update demo photos of iPhones to be more [ch16531]	2021-07-19 12:26:04 -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
snipe	ebb0aa5532	Merge pull request #9766 from uberbrady/livewire_integration_v6 ... Livewire integration for Snipe-IT v6	2021-06-28 21:51:00 -07:00