386 commits

Author	SHA1	Message	Date
snipe	27e0484072	I lied. Missed one ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 03:12:22 -07:00
snipe	ec76de607b	Final google login tweaks ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 03:08:29 -07:00
snipe	ed370a0104	Added translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 02:47:28 -07:00
snipe	788c03ef57	Hide client secret if app is locked ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 02:22:49 -07:00
snipe	37bc47290c	Disabled fields in demo mode ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 01:12:55 -07:00
snipe	4da40792ea	Use google logo ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 01:08:28 -07:00
snipe	f57e39191d	Added google settings blade ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 00:55:16 -07:00
snipe	6ab214d3a6	Added google option to settings index ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 00:55:04 -07:00
snipe	0680405f4d	Tightened up some layout issues, checkbox issues in LDAP settings ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-09 22:34:46 -07:00
snipe	7dd41aa574	Removed whitespace ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-08 15:49:12 -07:00
snipe	223ff5e97e	Fixed misplaced div when saml is disabled ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-08 11:20:26 -07:00
Godfrey M	cb68f41d9c	added ldap_location to settings	2023-04-25 11:44:04 -07:00
snipe	bd4757ad7a	Merge pull request #12779 from snipe/features/replace_icheck_with_only_css ... Move from iCheck to pure CSS for radio and checkboxes	2023-04-06 14:58:33 -07:00
snipe	161999fbca	Fixed #12772 - use the APP_URL config more consistently ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-05 16:05:40 -07:00
snipe	5df34d0058	Diable SAML submit if in demo mode ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 22:40:25 -07:00
snipe	9a3e727390	Updated other form fields to use new label class, fixed HTML for accessibility ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 22:38:56 -07:00
snipe	5a709a83e7	Small UI tweaks ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-14 09:38:30 -07:00
Godfrey M	b6d105c4f4	removes help text from general integrations	2023-03-13 10:49:41 -07:00
Godfrey M	35dd0d8def	adds generalized webhooks, updates settings page, translations, validation	2023-03-07 15:48:21 -08:00
Godfrey M	aae178a606	gets select working, placeholders update dynamically	2023-03-01 17:10:10 -08:00
Godfrey M	e8fc895e51	"adds variables, but still not working"	2023-02-27 09:19:59 -08:00
snipe	6c3ffa7918	Removed unused CSS ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:39:24 -08:00
Godfrey M	f95a904d90	adds integration button, working on its functionality	2023-02-01 12:08:13 -08:00
Godfrey M	1e0c58c3cf	saves data correctly now	2023-01-31 11:32:05 -08:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
Godfrey M	a63ea560ae	adds submit button, getting setAttribute error	2023-01-26 15:17:08 -08:00
Godfrey M	a69cb6204a	adds rest of inputs, and corrects Data binding	2023-01-25 16:22:34 -08:00
Godfrey M	2e22eeade5	adds one input	2023-01-25 14:29:20 -08:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
Brady Wetherington	cbffd105a2	Fix LDAP default group feature	2023-01-09 15:23:19 -08:00
Godfrey M	2e228ccb0b	redid a few things. should be good now :)	2022-12-15 10:45:42 -08:00
Cram42	af0872dc23	Fix form refresh after bootstrap-table	2022-11-11 14:23:38 +08:00
Cram42	30a7a31724	Move label preview to alpine component	2022-11-11 14:23:02 +08:00
Cram42	a4b93d4bbd	Create Field Definitions helper control	2022-11-10 19:20:18 +08:00
Cram42	fd9616683c	Label preview auto-refresh	2022-11-03 10:20:12 +08:00
Cram42	f5fac50e91	Add preview pane	2022-11-02 19:31:34 +08:00
Cram42	6de48b4dc8	Implement settings for labels	2022-11-01 20:00:53 +08:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
snipe	ad8a2387f0	Updated help text to be more clear ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:38:37 -07:00
snipe	70c766e8b3	Added setting to choose dashboard type ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 04:16:46 -07:00
Godfrey M	9b448227f7	tinkering to no avail	2022-09-13 11:40:10 -07:00
Godfrey M	193b31e427	select options working, testing sync then done	2022-08-31 12:58:33 -07:00
Godfrey M	70ac8af9c4	.	2022-08-31 09:53:20 -07:00
Godfrey M	0c362e8b57	gets the groups selector to appear but options are blank	2022-08-29 12:09:56 -07:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
Godfrey M	2994c3613a	adds clearfix to settings page	2022-08-22 10:46:15 -07:00
Brad Coudriet	77a1fcb1fc	There was actually a missing p tag too	2022-08-09 06:36:53 -04:00
Brad Coudriet	0cf0598936	Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly	2022-08-09 06:32:03 -04:00
snipe	75d19d815d	Still show the purge button even if not allowed to avoid confusion ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:59:40 -07:00
snipe	fce4f0dc0e	Disable delete button if not allowed ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:49:07 -07:00
snipe	77bf28bcb6	Disallow purge ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 20:11:43 -07:00
snipe	ce2362459c	Layout tweak for search and back placement ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:30:52 -07:00
snipe	4e568bec8a	Moves the settings search box higher ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:25:30 -07:00
snipe	35365882ac	Used new settings_button class in settings index ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:10:28 -07:00
snipe	8f5ac5fb55	Removed quotes around filter query ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 13:01:53 -07:00
snipe	1c4864a3cc	Added explicit “Example:” text in placeholders ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 11:25:18 -07:00
snipe	4078e4e323	Added spinner onClick for file upload button on backups ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 02:40:32 -07:00
Brady Wetherington	213d990e47	We inadvertently used the wrong label for one of the headers on the backups page	2022-05-16 17:00:22 -07:00
snipe	ed8e82a606	Removed sr-only class for now - not sure why it’s interfering with the submit button JS ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 11:02:02 -07:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07: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
Alex Janes	edef640d35	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
snipe	d9624b59b4	Merge pull request #10264 from nuraeil/added-localized-strings ... Added #10242: Improved localized strings	2022-01-10 14:48:52 -08:00
snipe	b98c97b00e	Merge pull request #10265 from uberbrady/remove_old_ldap ... Remove old ldap	2022-01-10 14:34:34 -08:00
Nuraeil	5bb2f6fa0f	Merge branch 'develop' into added-localized-strings	2022-01-09 17:40:54 +01:00
snipe	0f5bb0e65d	Localize bakcup restore strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-07 16:50:19 -08:00
Wächtler, Yannick	04d649122b	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Brady Wetherington	3c7f2e89ec	Merge branch 'develop' into remove_old_ldap ... Had to re-do the composer install because the conflicts were too complicated.	2022-01-03 12:56:58 -08:00
Alex Janes	5fe2083688	Adjusted the phrasing around auto-incrementing asset tags.	2021-12-31 16:33:30 -05:00
Alex Janes	ead142cdf7	Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)	2021-12-18 12:00:07 -05:00
Wächtler, Yannick	2901525194	Merge branch 'snipe-develop' into added-localized-strings	2021-12-17 00:22:08 +01:00
snipe	398180dc59	Small merge unmagling ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 14:38:04 -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
Wächtler, Yannick	484b996879	fixed merge conflicts	2021-12-14 19:48:59 +01:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	cde2bad297	Small mods to slack jquery ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:05 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
Wächtler, Yannick	9164daf5bc	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
snipe	65d1855b38	Display app_locked message on front-end ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:50:55 -08:00
snipe	bc21875324	More refinements to the UI ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 18:15:38 -08:00
snipe	1a703bf78b	Added logout clarification ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:59:52 -08:00
snipe	494c72d92b	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:58:04 -08:00
snipe	69fe3c0299	Added some comments on the JS ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:57:15 -08:00
snipe	e2702186a9	Slightly reworked UI ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:48:59 -08:00
snipe	b069eec43a	Fixed upload disabled button ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 16:01:22 -08:00
snipe	f8cf65bbb3	Small layout fixes ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 13:01:02 -08:00
snipe	230a568145	Added help text and more info in the modal ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:44:11 -08:00
snipe	856b9294f8	Improved BS tables on backups ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:08:43 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
snipe	61f16f47a2	Use Helper alias ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 19:44:55 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	299ad681f7	More fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 07:21:30 -07:00
snipe	dbe93d91cd	Updated fontawesome icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Brady Wetherington	0ec2884c29	The custom settings section of SAML sometimes has bad linefeeds	2021-07-08 17:00:01 -07:00
snipe	3f09d17389	Fixed typo “synchronization” ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-25 18:45:06 -07:00
snipe	9aac3ae628	Fixed HTML causing two backup headers to appear ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 16:36:07 -07:00
snipe	1d43eda21f	Features: improved UI for importer (#9467) ... * Small UI improvements for importer Signed-off-by: snipe <snipe@snipe.net> * And UI backup improvements Signed-off-by: snipe <snipe@snipe.net>	2021-04-21 20:16:17 -07:00
snipe	e1c6d4ced7	Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Requests/SettingsSamlRequest.php	2021-04-14 15:15:07 -07:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416) ... * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) ... * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
snipe	70a7a8f20b	WTF. This shit is haunted. ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-30 08:00:27 -07:00
NMC	3e934a1b96	Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891) ... * Add a way for a user to override the skin setting. * Add site setting to allow user to change the skin. * Fix skin list. Co-authored-by: NMC <info@nmc-lab.com>	2021-03-29 19:09:23 -07:00
Eli Young	97fa9663b1	Fixed #9299: Use correct SVG MIME type for uploads (#9300) ... The correct MIME type of SVG is image/svg+xml. Out of an abundance of caution, I am leaving in image/svg to avoid potentially causing issues on very old browsers, but this can likely be removed without issue.	2021-03-15 16:42:11 -07:00
Evgeny	bbf7fbcff4	Localization digit separator feature. (#8915) ... Provides an ability to localize the purchase_cost field in front-end hardware index table. Has two digit separator formats in admin settings with comma and dot.	2020-12-15 11:49:13 -08:00
johnson-yi	0cdd83aabf	Fixes #8584, #8654, #8727 - fixes and improvements for saml (#8795) ... * Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy * Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing * Improve ui of saml sp metadata by displaying it's url and a download button	2020-11-20 18:54:25 -08:00
Brady Wetherington	a97b15ec96	Re-add LDAP "test login" feature to LDAP settings (helps with #8751) (#8757) ... * Start work on re-adding back the "Test LDAP logins" feature to develop * Add back-end method to allow LDAP test users to try to log in.	2020-11-16 21:23:08 -08:00
snipe	0c0de5e351	Added clarity in language as to what the activated flag does on LDAP screens	2020-11-13 11:52:34 -08:00
snipe	7765c87387	Fixed #8669 - Allow application/xml in SAML upload in Safari	2020-11-12 18:47:19 -08:00
snipe	6a2e21f502	More in depth error reporting on mail test failure	2020-11-12 13:22:49 -08:00
snipe	fd7c0bc5fb	Use newer blade facade for requests	2020-11-10 08:36:18 -08:00
snipe	a55694da2f	Added validation to disallow password to be the same as username, email, etc	2020-11-02 20:03:26 -08:00
snipe	33bda9b6d1	Added blade option for same_pwd_as_user_fields ... Disallows password form value to be the same as username, email, first name or last name	2020-11-02 17:47:25 -08:00
snipe	f357d9fc90	Include audit settings text in settings overview so they get picked up by the filter box	2020-10-23 18:13:28 -07:00
Bennett Blodinger	132f296f03	Fix typo	2020-10-20 08:13:52 -05:00
snipe	b49c5dbf06	Clarified language	2020-10-05 20:43:28 -07:00
snipe	6234c6e5fc	Fixed typo	2020-10-05 20:35:27 -07:00
snipe	0cd19c87bf	Added utility to delete barcode cache from labels/barcodes setting	2020-10-05 20:34:17 -07:00
snipe	dafac4ceb3	Disable ldap_enabled on demo, fixed some incorrect error messages	2020-09-25 19:04:38 -07:00
snipe	98246de4c7	Disable SAML on the demo	2020-09-24 19:25:28 -07:00
Brady Wetherington	0e823a962b	Fix for #8424 - where the ldap_server setting was grayed out	2020-09-17 13:32:14 -07:00
snipe	002ca52c83	Standardize feature disabled messages in UI	2020-09-16 15:09:58 -07:00
Brady Wetherington	8331be05aa	Some fancy JS to enable/disable Slack-test based on field values	2020-09-16 13:15:39 -07:00
snipe	e8dfb71682	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop ... # Conflicts: # resources/views/settings/slack.blade.php	2020-09-16 12:40:23 -07:00
snipe	7de685a1c1	Added demo disabled text on slack screen	2020-09-16 12:36:33 -07:00
snipe	30f8431bfb	Added required field indicator	2020-09-16 12:29:20 -07:00
snipe	74b96a7413	UI tweaks and updated JS to disable the save button if the settings are not correct	2020-09-15 23:14:10 -07:00
snipe	4fd5358aa8	Changed login attempts icon so it’s not the same as SAML	2020-09-15 20:27:01 -07:00
snipe	e8befe9afd	Increased favicon filesize max	2020-09-15 20:07:29 -07:00
snipe	303388e1f5	Added a space between favicon help text blocks	2020-09-15 19:50:15 -07:00
snipe	912401a0a0	Change warning icon to padlock icon	2020-09-12 12:07:56 -07:00
snipe	ec5daa387b	Better explanation for demo mode	2020-09-12 10:04:57 -07:00
snipe	e1cc003cec	Fixed backup urls for download	2020-08-28 18:22:37 -07:00
Michael Pietsch	4f5374b2e8	enable use custom file based saml certificate/private key	2020-08-14 12:25:00 +02:00
snipe	4e0a9c7a94	Fart fix ... I just…. don’t ask.	2020-08-03 12:35:34 -07:00
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	412caebf69	Fixed logo uploads ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 23:22:52 -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	b01e8720dc	Fixed ldap settings JS error ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 14:41:20 -07:00
snipe	e786ef8290	Pull branding back to develop normal	2020-04-21 10:42:37 -07:00
snipe	be446eedb0	Updated html styles on settings index	2020-04-21 06:29:08 -07:00
snipe	cb71bcc4af	Switch to old() helper	2020-04-21 03:58:31 -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	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	bdddab5b8b	Added role=“option” to option items, additional icon font fixes	2020-04-02 18:17:21 -07:00