1396 commits

Author	SHA1	Message	Date
Johnson Yi	572185ac96	Revised how saml sp info is displayed	2020-05-09 09:44:51 +10:00
Johnson Yi	b2930d6069	Added #542: add saml authentication	2020-05-06 00:06:19 +10:00
snipe	8ecb7969df	Fixed incorrect route for saving groups ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-01 01:26:15 -07:00
snipe	8507bcd16b	Merge pull request #8008 from dmeltzer/component-checkinout-fixes ... Component checkout/checkin fixes.	2020-04-30 17:49:22 -07:00
snipe	e47c44d055	Merge pull request #8007 from dmeltzer/permissions-form-cleanup ... Permissions edit cleanups.	2020-04-30 17:48:24 -07:00
snipe	8bb3c01f78	Addressed merge issue for reset password for #7997 ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 17:45:05 -07:00
Daniel Meltzer	bfba30058c	Fix incorrect routing.	2020-04-30 10:35:26 -04:00
Daniel Meltzer	debdccf5f1	Remove old help text translation that doesn't exist any more	2020-04-30 10:35:11 -04:00
Daniel Meltzer	358609720a	Component checkout/checkin fixes. ... - Provide proper translated messages for checkin vs checkout - Pass appropriate methods to the Checkout event, fixes an error on checkin. - Default to a value of 1 on checkin in UI to save a click sometimes.	2020-04-29 12:50:09 -04:00
Daniel Meltzer	42e1e9a0bd	Permissions edit cleanups. ... - Make each section of permissions it's own tbody for better styling - Remove extra separators when theres nothing to separate - Vertically center radio buttons in header rows. Still on the ideal list: - Unify code between users and groups into one partial with conditionals. - Sticky header row or put the header row in each section.	2020-04-29 12:33:50 -04:00
Daniel Meltzer	bb50828ca0	Remove General serial field now that the serial is part of the multi asset creation.	2020-04-28 11:39:53 -04:00
snipe	c2f1fd4942	Make user form a little nicer looking ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-28 00:01:47 -07:00
snipe	412caebf69	Fixed logo uploads ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 23:22:52 -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	f172747495	Handle parse error in custom fields edit per #7997 ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 19:36:07 -07:00
snipe	6427f46a6b	Removed mix (switched to url()) for now until assets are fixed ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 19:35:21 -07:00
snipe	6847a331a7	Backport the column icon fix from master ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 05:55:38 -07:00
snipe	bea3a7b982	Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 00:39:32 -07:00
snipe	44962d1eb9	Switched to use Primary button ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:44:48 -07:00
snipe	e69461d797	Cleaned up LDAP sync blade ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:44:28 -07:00
snipe	b01e8720dc	Fixed ldap settings JS error ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 14:41:20 -07:00
snipe	c50b81ff19	Added resources ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:15:24 -07:00
snipe	b5cc845216	Removed vendor.js from setup blade ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:15:12 -07:00
snipe	3435485a46	Updated path to skin css ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 06:41:19 -07:00
snipe	82b6d2b31b	Fixed a few more tests	2020-04-21 21:13:00 -07:00
snipe	05e9861b71	Checkin/checkout fixes	2020-04-21 11:28:31 -07:00
snipe	cff2a65f62	Fixed broken if/else in view from bad merge	2020-04-21 11:13:29 -07:00
snipe	7a6ca5cb40	Tempt fix for css weirdness ... TODO: figure out why overrides isn’t being compiled into css/dist/all.css	2020-04-21 11:03:32 -07:00
snipe	1d8c3a73ea	Use non-min version of skin until we can get the other webpack stuff sorted	2020-04-21 10:43:04 -07:00
snipe	e786ef8290	Pull branding back to develop normal	2020-04-21 10:42:37 -07:00
snipe	c38bbfc8bd	Removed title from more info link	2020-04-21 06:29:34 -07:00
snipe	be446eedb0	Updated html styles on settings index	2020-04-21 06:29:08 -07:00
snipe	dc6e329d96	Fixed name in comments	2020-04-21 06:18:24 -07:00
snipe	72b3228d82	Fixed HTML tags	2020-04-21 06:15:31 -07:00
snipe	cb71bcc4af	Switch to old() helper	2020-04-21 03:58:31 -07:00
snipe	58f6b2da5a	Fixing assets	2020-04-21 03:42:35 -07:00
snipe	b670371e0b	Ugggh… fixing a donked merge	2020-04-21 03:30:21 -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	7ebd21bc04	Added sr-only to the unstyles image upload button	2020-04-09 19:29:16 -07:00
snipe	83ee64f155	Added missing CSS class to text-only logo	2020-04-08 17:25:14 -07:00
snipe	a0f7fdc57a	Merge branch 'fixes/accessibility_fixes' ... # Conflicts: # 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 # resources/assets/js/components/importer/importer-file.vue	2020-04-08 11:19:42 -07:00
snipe	1a5785a8d3	Fixed dashboard header size	2020-04-06 21:30:28 -07:00
snipe	320d660e83	Updated chartjs	2020-04-06 21:17:26 -07:00
snipe	fb903b2fda	Added comments, better indenting	2020-04-06 21:05:42 -07:00
snipe	7bf398aca4	More settings filter fixes	2020-04-06 20:47:05 -07:00
snipe	f6bb655383	Prevent form submission	2020-04-06 20:17:44 -07:00
snipe	19f71face9	Added filtering to settings page	2020-04-06 20:11:13 -07:00
snipe	d82b94e281	Pull blue stylesheet if no skin was selected	2020-04-06 19:04:49 -07:00
snipe	a8032ac388	Switched to btn-primary for submit	2020-04-02 18:38:54 -07:00
snipe	21d8225696	Use button primary for higher contrast	2020-04-02 18:33:26 -07:00