2425 commits

Author	SHA1	Message	Date
snipe	824eedf7c2	Added UI elements for is_unique ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:48 -08:00
Dampfklon	0d49fc3a2e	remove unused route, controller functions and view	2022-02-13 12:10:19 +01:00
Dampfklon	43d92bec5b	apply translation to view ... rearrange eula on top small design fixes	2022-02-13 12:02:20 +01:00
snipe	8b8e93d703	Fixed #10659 - wrong translation string reference ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 21:03:09 -08:00
snipe	d406dc43c2	Check for valid user before trying to present the auditor name ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:13:02 -08:00
snipe	2ce44bd4e6	Line break for easier debugging ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:06:55 -08:00
snipe	6b25b53462	Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio ... Fixes #10299 Default Values do not allow Checkbox/Radio Buttons	2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco	6d79c9f3e2	Save the default values for custom fields with same format than Assets do for actual values	2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco	a36957dd77	Finish the implementation of custom fields default values for checkboxes	2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
Godfrey M	5a70bba51b	changed model for default currency requirement check	2022-02-07 09:51:35 -08:00
snipe	8add47739e	Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null ... Fixes: Column activated cannot be null [sc-18528]	2022-02-02 12:21:31 -08:00
snipe	c0cc90066f	Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop ... Fixes: Column activated cannot be null for develop [sc-18528]	2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco	fa2f8409f9	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 14:09:23 -06:00
Ivan Nieto Vivanco	eac8e0bdba	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 13:54:57 -06:00
snipe	ce154a2382	Merge pull request #10455 from adagioajanes/features/quickscan_checkin ... Added #10454: Quick Scan Checkin	2022-02-01 20:19:45 -08:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
snipe	2815e0d36e	Fixed audit email template (applies #10592 to master) ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 17:27:32 -08:00
Brady Wetherington	eaba560877	We had a markdown failure in the upcoming audits table, this fixes it.	2022-02-01 14:06:01 -08:00
Ivan Nieto Vivanco	a87478d3ac	Set the actual field we are evaluating as required (months)	2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco	34819ec5cf	Fixes the appearance of some error messages	2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco	44349db597	Fixes the appearance of some error messages	2022-01-26 22:58:02 -06:00
Ivan Nieto Vivanco	7383ec7f1e	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco	9ae03f21dc	Adds condition to only charge custom field's livewire when the model is updated	2022-01-15 12:14:34 -06:00
snipe	67ba8a6281	Removed extra spaces ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:18:39 -08:00
snipe	9368ddeaf0	Added badge count on requestable assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:17:54 -08:00
snipe	f206d4ed4e	Fixed double div in current purchase value ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:26:56 -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	df0da0f3bc	Fixed escaped string ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 11:20:31 -08:00
Alex Janes	d2bb3e6377	Merge branch 'develop' into features/quickscan_checkin	2022-01-11 16:40:20 -05: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
Wächtler, Yannick	f906dbd81e	Added missed translation strings, fixed the column width for the date selector (too small in certain languages)	2022-01-10 09:21:23 +01:00
Nuraeil	5bb2f6fa0f	Merge branch 'develop' into added-localized-strings	2022-01-09 17:40:54 +01: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	0f5bb0e65d	Localize bakcup restore strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-07 16:50:19 -08:00
Wächtler, Yannick	c3ab4c7512	Fixed the tables not displaying the correct language	2022-01-06 14:29:10 +01: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
Nuraeil	271c364ef8	Merge pull request #9 from snipe/develop ... Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings	2022-01-04 10:48:51 +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	ea93f82bde	added the notes field to allow users to quickly add notes to multiple checkins at once	2021-12-23 17:37:48 -05:00
Alex Janes	b01a4468c7	refactored from bulkcheckin to quickscancheckin	2021-12-20 23:27:36 -05:00
snipe	48d3bfef03	Merge pull request #10421 from Robert-Azelis/patch-5 ... Create new user account from asset form - additional fields	2021-12-20 17:05:38 -08:00
Alex Janes	55b8d080b9	more lang changes	2021-12-20 19:39:06 -05:00
Alex Janes	3841c3560b	changed a page title	2021-12-20 16:52:00 -05:00
Alex Janes	08cb8c354b	more cleanup to fit formatting convention	2021-12-19 19:11:24 -05:00
Alex Janes	29da4f4325	Removed a bunch of redundant code I created from the API	2021-12-19 18:39:57 -05:00
Alex Janes	bc4fe88ac0	First version of bulk checkin	2021-12-19 16:53:31 -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
snipe	9b2dd6522f	Switch GET to POST for asset request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:36:08 -08:00
snipe	4ca2252e3b	Switches GET to POST for request assset ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:32:29 -08:00
Wächtler, Yannick	2901525194	Merge branch 'snipe-develop' into added-localized-strings	2021-12-17 00:22:08 +01:00
Wächtler, Yannick	279fced877	merge	2021-12-17 00:14:36 +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
Nuraeil	c3b7576d99	Merge pull request #7 from snipe/develop ... Develop	2021-12-14 19:51:40 +01:00
Wächtler, Yannick	484b996879	fixed merge conflicts	2021-12-14 19:48:59 +01:00
snipe	52322806fa	Merge pull request #10434 from inietov/fixes/v6_components_error ... Fix route to checkout components from the details page	2021-12-14 10:41:24 -08:00
Wächtler, Yannick	4397a12efc	Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop	2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco	d083f89f30	Delete extra character remaining from previous tests :(	2021-12-14 12:32:30 -06:00
Ivan Nieto Vivanco	2402f00a2e	Fix route to checkout components from the details page	2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
Robert-Azelis	01608d81ab	Update user.blade.php ... Create new user account from asset form - additional fields #10420	2021-12-13 09:22:25 +01:00
snipe	e1bf3b50f4	Added model number to accessory report ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-10 15:09:29 -08: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	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk ... WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	0ba55e0eaf	Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase ... Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…	2021-12-06 14:08:24 -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
Andrew Roth	d1d3b84f77	Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item.	2021-12-06 13:06:23 -05:00
snipe	cae62fd4c7	Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity ... Fixed #5676: Sum cost by quantity	2021-12-02 12:13:04 -08:00
snipe	d08c1787a1	First steps at getting dusk working ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-30 20:09:29 -08:00
Nuraeil	d3972888dc	Merge pull request #6 from snipe/develop ... Develop	2021-11-30 06:37:17 +01:00
snipe	3b68a6f1be	Merge pull request #10345 from leitwerk-ag/master ... Fixed #10344 and #9135: don't prepand fields with a whitespace in text based export formats	2021-11-24 19:43:21 -08:00
snipe	4afd598df7	Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo ... fix modal-title html tag unpaired.	2021-11-24 19:39:58 -08:00
Shao Yu-Lung	55d05eeae3	fix modal-title html tag unpaired.	2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco	d95d3dc282	Add the call to defaultValue() function in custom fields with date format	2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco	741eb28622	Add the call to defaultValue() function in custom fields with date format	2021-11-23 17:11:21 -06:00
Klaus J. Mueller	a85fa14f9c	fix #10344 and #9135	2021-11-22 17:58:26 +01:00
Matthew Nickson	9381ba2404	Merge branch 'develop' into sum_cost_by_quantity	2021-11-21 18:59:34 +00:00
Wächtler, Yannick	1b76185798	Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them	2021-11-19 15:32:13 +01:00
Wächtler, Yannick	9164daf5bc	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
Wächtler, Yannick	6917d59185	Added localized strings for reports	2021-11-19 12:39:19 +01:00
Wächtler, Yannick	04fec144a0	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
Nuraeil	7084703b5a	Merge pull request #4 from snipe/develop ... Merge current develop into branch	2021-11-18 21:30:45 +01:00
Wächtler, Yannick	5a2f8788a9	Fixed merge issue in view.blade.php and added translatable string	2021-11-16 19:34:20 +01:00
Wächtler, Yannick	f2c3e51a83	Catching up to snipe-it/develop branch	2021-11-16 19:25:23 +01:00
Wächtler, Yannick	6feb39f6b9	Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop	2021-11-16 08:50:45 +01:00
snipe	bbb0d1be17	Possible fix for asset model editing when no custom fieldset is associated ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 21:09:35 -08: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	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	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	ec2a3b0f35	Updated label names ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:44:34 -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
snipe	8590e5d67e	UNRELATED: fixed wrong html tag for license view badge count ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:08:15 -08:00
snipe	fb21712a68	Added restore modal HTML ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 19:38:40 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
snipe	edf98cb795	Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required ... Turn custom fields required/optional/remove into POST requests	2021-11-08 14:37:36 -08:00
snipe	38c36af6fc	Changes logout to POST ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-08 12:53:11 -08:00
snipe	0d811d067c	Turn cusotm fields required/optional/remove into POST requests ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-05 10:53:48 -07:00
Wächtler, Yannick	6b2801867d	Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general	2021-11-04 20:15:23 +01:00
Wächtler, Yannick	63b30489df	Added localized strings for notifications	2021-11-02 15:44:57 +01:00
Wächtler, Yannick	670b70c7e1	Added localized strings for models	2021-11-02 15:34:50 +01:00
Wächtler, Yannick	c0891e6827	Added localized strings for modals	2021-11-02 15:27:13 +01:00
Wächtler, Yannick	30d30490a3	Added localized strings for locations	2021-11-02 15:14:54 +01:00
Wächtler, Yannick	4af6412da6	Added localized strings for licenses	2021-11-02 14:55:49 +01:00
Wächtler, Yannick	4fcd4a930f	Added localized strings for layouts	2021-11-02 14:45:58 +01:00
Wächtler, Yannick	8bad9c5140	Added localized strings for kits	2021-11-02 14:25:21 +01:00
Wächtler, Yannick	26e056fb3c	Added localized strings for improter, added en structure	2021-11-02 14:09:22 +01:00
Wächtler, Yannick	c16ade2d87	Added localized strings for hardware	2021-11-02 14:02:48 +01:00
Wächtler, Yannick	167bf97d46	Added localized strings for groups	2021-11-02 12:03:41 +01:00
Wächtler, Yannick	e825fa81aa	Added localized strings for depreciations	2021-11-02 11:50:56 +01:00
Wächtler, Yannick	a96c53784c	Added localized strings for custom_fields	2021-11-02 11:27:53 +01:00
Wächtler, Yannick	c11af0e222	Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php	2021-11-02 10:40:41 +01:00
Wächtler, Yannick	433d6fd3e0	Added localized strings for admin/companies	2021-11-02 10:23:15 +01:00
Wächtler, Yannick	b784e63aa8	Added localized strings for account	2021-11-02 10:13:22 +01:00
Matthew Nickson	90ca66834b	Fixed sumFormatterQuantity if using 1.234,56 fomat ... Previously sumFormatterQuantity used the parseFloat to convert the string purchase_cost to a floating point number. parseFloat does not return the correct value when using the comma format. To fix this sumFormatterQuantity now used the cleanFloat function to convert purchase_cost to a float. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2021-10-30 22:48:45 +01:00
Brady Wetherington	31933a56fa	Trying to get the login screen working	2021-10-28 18:18:11 -07:00
snipe	798f6d65de	Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self ... Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view	2021-10-28 17:53:24 -07:00
snipe	dc71f6ddc6	Merge pull request #9871 from jethron/patch-1 ... Fixed: double slashes in branding logo URL path	2021-10-28 17:36:43 -07:00
snipe	3ede7c7f18	Use icon and string for maintained value in license view ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 17:26:03 -07:00
snipe	645529ba78	Merge pull request #9889 from ncareau/api-licenses ... Add licenses api parameters and fix a missing variable in license view.	2021-10-28 17:20:09 -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	52ef9280ba	Adds reqestable as model bulk edit field ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 15:15:54 -07:00
snipe	668e8a357c	Fixed labels in profile form ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 12:57:27 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
snipe	365349fd91	Center custom fields email icon ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-18 18:39:46 -07:00
snipe	bda23bb1e6	Fixes possible XSS on all-file-types export ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-15 11:50:52 -05:00
snipe	4095a3f8c4	Removed dupe bars ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:31:08 -07:00
snipe	892fc0004a	Fixed misisng hamburger menu ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:09:46 -07:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	ed99532c30	Unaccepted Assets Report Actions (send reminder, delete) added ... Unaccepted Assets Export fixed	2021-10-07 20:53:02 +02:00
snipe	7848a3c3dc	Use Storage:: facade for image preview for models ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 13:12:42 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
Brady Wetherington	bbeedc026d	A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.	2021-10-04 22:07:29 -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	dc3af7cc74	Resolved conflicts ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:39:24 -07:00
snipe	e491a93892	Removed restore link ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:56:56 -07:00
snipe	b20c841a89	Fixed asset models restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:29:13 -07:00
snipe	8fe59f8383	Switch users restore over to POST ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:22:38 -07:00
snipe	8bf09d9f89	Make form-based restore button on asset view ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:01:16 -07:00
snipe	3594ec9905	Handle bulk check and uncheck ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:58:16 -07:00
snipe	52caee2a9f	Handle checking and unchecking for bulk actions ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:26 -07:00
snipe	52ea172e5d	Fix ID array ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:07 -07:00
snipe	85b5f52cd8	Nicer mobile view for user view icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 23:04:30 -07:00
snipe	61f16f47a2	Use Helper alias ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 19:44:55 -07:00
Brady Wetherington	ae466be153	Fix license output, tweak CleanFloat function to handle numbers over 1 million	2021-09-28 19:10:25 -07:00
Brady Wetherington	f380da3f19	Try to ensure all currency output is formatted correctly.	2021-09-28 16:45:47 -07:00
snipe	9311f8694f	Fixed incorrect icon for map marker ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 09:35:48 -07:00
NMC	c680977791	Merge branch 'develop' into api-licenses	2021-09-27 15:02:51 -04:00
snipe	1657ba396f	Added available license seat count to top tabs for licenses ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 15:03:56 -07:00
snipe	f0da1977fb	Small visual improvements on consumables view ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 14:32:51 -07:00
snipe	450da5661d	Add additional info on accessories view page ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 03:59:04 -07:00
snipe	a6632a7b9f	Use new row striping on licenses detail page ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 03:58:53 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	65a6da5bd2	Added files tab back to assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:59:02 -07:00
snipe	a7b3f98e9f	Updated angle icon with new font awesome ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:57:27 -07:00
snipe	8ee00d0f42	Changed paperflip to file icon ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:57:06 -07:00
snipe	67d898e897	Updated map icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:36 -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	e03d7b7016	More fa icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 13:07:02 -07:00
snipe	20e23c1248	Fixed 500 on wrong association ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:54:47 -07:00
snipe	5875cf1e9e	Removed test code ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:33:34 -07:00
snipe	decc771459	Starting to refactor the hardware page ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:05:48 -07:00
snipe	78fa6452ee	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:05:18 -07:00
snipe	2c141813f1	Better formatting ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:51:52 -07:00
snipe	3317b5107a	Added ribbon to show on user's photo that they are an admin ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:55 -07:00
snipe	0d1bd5b470	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:34 -07:00
snipe	299ad681f7	More fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 07:21:30 -07:00
snipe	b2dc92b088	And a few more missed icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:44:38 -07:00
snipe	ad6f073c82	Few more icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:38:23 -07:00
snipe	8aba37522d	More FA icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:18:22 -07:00
snipe	dbe93d91cd	Updated fontawesome icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
snipe	4a8f06b0f1	Added badge counters to tabs ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 04:12:22 -07:00
snipe	8937396a26	Added padding to the sidenav on mobile ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:57 -07:00
snipe	fd7c6179d5	Show the user's photo frst on mobile view ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:47 -07:00
snipe	7f41bdf0b0	Use new striping on hardware page ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:17:57 -07:00
snipe	90c22caa4b	Rework user page to no longer use tables for data layout ... This also fixes the weird display when lines break Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:17:40 -07:00
snipe	fedf51dda4	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 18:29:47 -07:00
snipe	0f40ba2b34	Check for admin rights before displaying admin permission options ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:31:49 -07:00
snipe	39a702397a	Add user permissions message if the user is not an admin or better ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:05:02 -07:00
snipe	61cf9ec009	Small conflict handling bits ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 00:00:44 -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
snipe	b4a90045e6	Added totals to depreciation report footer ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:52:18 -07:00
snipe	9b78b25372	Grr. 100 should be 1000 ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:28:59 -07:00
snipe	7df4f98e19	Bump number per page up to 1000 ... Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries. Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:25:22 -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	0d633ce618	Fixed issue where created_at date was not showing on uploads ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-13 17:13:01 -07:00
snipe	c6b26965a0	Check for valid category name ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-13 15:47:13 -07:00
Ivan Nieto Vivanco	1ae665b645	Use the property 'archived' so if the 'name' one changes it doesn't fails	2021-09-13 16:45:05 -05:00
Ivan Nieto Vivanco	1b433920f1	Delete an extra semicolon	2021-09-13 16:24:12 -05:00
Ivan Nieto Vivanco	2b64af0d34	Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings	2021-09-13 16:17:34 -05:00
snipe	cfaa6679af	Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history ... Fixed #10026: Checkout date not saved in asset history	2021-09-07 17:37:30 -07:00
snipe	387018c44e	Updated depreciation report blade to use server-side API ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-01 17:05:31 -07:00
Ivan Nieto Vivanco	e621eaf456	Change date showed in the activity report view, the condition is now on action_date	2021-09-01 13:58:17 -05:00
snipe	d5a7955e1d	Fixed #10024 - use string for dashboard in side nav instead of hard coded ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-31 22:25:00 -07:00
snipe	7e2def7896	Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments ... Fixes: Can't update departments if Full Company Support is activated	2021-08-30 19:40:59 -07:00
snipe	4abb9baa95	Merge remote-tracking branch 'origin/develop'	2021-08-24 15:29:41 -07:00
Godfrey M	a407fe9312	removed more dead space	2021-08-24 15:07:56 -07:00
Godfrey M	53ddf5ae04	removed dead space	2021-08-24 15:07:18 -07:00
Godfrey M	a197b730a1	fixed a layout issue with the month field in depreciations [ch17111]	2021-08-24 15:02:42 -07:00
Ivan Nieto Vivanco	830ba470dd	Change the used function to only affect single and double quotes	2021-08-23 22:10:59 -05:00
Ivan Nieto Vivanco	80fb24e861	Fix issue caused for single and double quotes when used as listbox's values	2021-08-23 22:00:01 -05:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs ... Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	4ec4e0f44e	Merge remote-tracking branch 'origin/develop'	2021-08-19 12:09:48 -07:00
Brady Wetherington	e28db2d221	Fix regression for NULL valued numbers in the summary calculation	2021-08-19 12:01:47 -07:00
snipe	24af2ab67a	Merge remote-tracking branch 'origin/develop'	2021-08-18 14:31:53 -07:00
Brady Wetherington	4519f6e180	Fixed sum total calculation on Bootstrap Table pages	2021-08-18 14:13:31 -07:00
snipe	04fa5f2022	Merge remote-tracking branch 'origin/develop'	2021-08-18 01:05:25 -07:00
snipe	923d2a79ae	Fixed weird layout on bulk audit [ch17146] ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 01:05: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	37f2c7beac	Nicer bulk asset select width ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:44:16 -07:00
snipe	b5bb74b8ca	Merge remote-tracking branch 'origin/develop'	2021-08-17 22:01:23 -07:00
snipe	cce808c784	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] ... Duplicates d4e46ee41f but on v5 Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 21:59:33 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
snipe	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
Godfrey M	01037cf9cb	initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]	2021-08-10 18:26:43 -07:00
Computroniks	8121d904e7	Licence cost calculation ... Licences use diffrent key to track quantity. sumFormatterQuantity has been modified to detect which key to use. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:33:39 +01:00
Computroniks	f994af16da	Added function to calculate cost based on quantity ... sumFormatterQuantity takes the same input as sumFormatter but instead of calculating the specified columns total it calculates the total purchase cost of an item based upon its quantity. Also updated affected pressenters to use this formatter. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:09:50 +01:00
NMC	976957ddd4	Add Maintained filed in licenses view and api. + Expires in API	2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco	1b8156ac7f	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
Jethro Nederhof	d8fdd1b408	Fix branding logo URL path ... The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes. E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg` For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s. Thanks for your work on Snipe-It, seems like a good system so far!	2021-07-28 14:55:34 +10:00
Ivan Nieto Vivanco	35ffe8b902	Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view	2021-07-20 18:56:22 -05:00
snipe	4cfdaf89d8	Merge remote-tracking branch 'origin/develop'	2021-07-08 17:47:08 -07:00
Brady Wetherington	0ec2884c29	The custom settings section of SAML sometimes has bad linefeeds	2021-07-08 17:00:01 -07:00
snipe	f264cade7d	Merge remote-tracking branch 'origin/develop'	2021-07-08 16:05:32 -07:00
snipe	06806341c7	Nicer tab names for permissions ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-08 15:57:41 -07:00
Ivan Nieto Vivanco	d2e94dfc1c	Added cookie option to assets Bootstrap Table to save the state of the table.	2021-07-08 14:05:40 -05:00
snipe	a12ae19e32	Try deferring the load so it doesn’t query the server server 7 times for login ... This doesn’t work? Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:50:32 -07:00
snipe	3332bbe072	Removed unused properties on login ... This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:27:44 -07:00
snipe	704eb728bc	Added livewire the login screen ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 02:16:57 -07:00
snipe	576e605f73	Make livewire less assy looking ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 22:40:18 -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
Brady Wetherington	a6ac4f94f1	Breaking out field-listing into its own Livewire blade for use elsewhere	2021-06-28 21:00:20 -07:00
Brady Wetherington	ea1f1eb972	Get some basic Livewire going for 'edit model's default values.	2021-06-28 21:00:20 -07:00
Brady Wetherington	8e66abb926	Basic Laravel7 compatibility, starting getting Livewire going	2021-06-28 21:00:16 -07:00
snipe	dc125af029	Fixed locations link on homepage module ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 19:56:41 -07:00
snipe	2365634139	Added dashboard module for locations [ch9199] ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 19:46:56 -07:00
snipe	4af247f845	Added additional boxes to the dashboard ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:36:15 -07:00
snipe	d4e46ee41f	Added comma in US currency format [ch16628] ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:14:32 -07:00
snipe	f504d7ef5f	Merge remote-tracking branch 'origin/develop'	2021-06-28 13:12:10 -07:00
snipe	a016f4ecd0	Applies PR #9761 to integration ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:11:22 -07:00
snipe	30297e479e	Hide notes field by default ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:08:32 -07:00
snipe	a4fd0c9c6d	Fixed #9745 - added searchable, sortable notes field to status labels ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:52:57 -07:00
snipe	3ca3de9e4f	Merge remote-tracking branch 'origin/develop'	2021-06-23 20:05:38 -07:00
snipe	174d53aff9	Fixed #9729 - order number maxlength updated to 200 ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 20:05:22 -07:00
snipe	1ea843248b	Fixed #9729 - bulk edit order number capped at 20 ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 20:04:45 -07:00
Brady Wetherington	8268aca9fc	Removed Ziggy.baseUrl references for meta references that had baseUrl	2021-06-23 19:57:45 -07:00
snipe	7b51bf4f51	Merge remote-tracking branch 'origin/develop'	2021-06-23 14:41:27 -07:00
snipe	4db5a8f62b	Merge pull request #9695 from Joly0/master ... Update print.blade.php	2021-06-23 14:33:25 -07:00
snipe	b3ec4bb31b	Porting PR #9720 to v6 integration ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 14:28:06 -07:00
snipe	ac52ea3463	Porting PR #9720 to develop ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 14:27:15 -07:00
Brady Wetherington	9456a03a88	Almost finished with the routes which is...hopefully? The last thing?	2021-06-22 16:58:23 -07:00
bmkalle	a330dca7d4	Update company-select.blade.php ... select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.	2021-06-17 10:51:00 +02:00
Joly0	9a429952ff	update print.blade.php	2021-06-15 08:52:01 +02:00
snipe	3095a78664	Small tweaks to Dashboard controller ... Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:43:47 -07:00
Joly0	72f27ccc5b	Update print.blade.php	2021-06-11 11:05:39 +02:00
Ivan Nieto Vivanco	9f944ad497	Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].	2021-05-27 15:48:13 -05:00
snipe	9f2b4c721d	Allow password reset from user profile ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-26 15:32:23 -07:00
snipe	3f09d17389	Fixed typo “synchronization” ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-25 18:45:06 -07:00
snipe	9eea46adef	Fixed parse error in user print view ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-20 13:53:43 -07:00
Jonathon Reinhart	fd082addff	Fix incorrect case of ldap sync status string (#9563) ... Fixes #9562	2021-05-12 19:15:39 -07:00
snipe	76897f3a3a	Make label printing from asset page more consistent with normal UI ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-12 17:08:53 -07:00
tbrconnect	a29ef73346	Feature #3088 Print labels from asset detail page (#9559) ... This PR adds a "Generate Label" button to the detail asset page as described in #3088. Fixes #3088 Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>	2021-05-12 13:38:26 -07:00
Brady Wetherington	62199f6255	Manually re-add support for Label Logos in Labels (#9552)	2021-05-07 17:01:32 -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	ece627b3a3	Small fixes for location printing when relationships are missing/invalid, per #9521 ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 10:23:46 -07:00
snipe	d8d3fa2293	Only show department if it’s valid ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 10:13:19 -07:00
snipe	57b9b571dc	Fixed #9531 - highlight search box when filled, add clear button (#9534)	2021-05-04 22:00:34 -07:00
snipe	32f043c5df	Set the body skin style if one was overridden by the user profile ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:25:39 -07:00
snipe	23376c317e	Use correct URL for css for subdirs ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:22:02 -07:00
snipe	b3b02933a5	Removed duplicate code ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:21:48 -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	90f79eaf83	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-04-21 10:23:46 -07:00
aranar-pro	5127727730	Fixed #9424: import history adds asset model to assigned user and respects checkin date (#9350) ... * Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users. * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items. * Fixed #9294: whitespace and comment cleanup for merge * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.	2021-04-20 21:25:17 -07:00
snipe	d10d090d33	Moved status label help text to headline ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:31:07 -07:00
snipe	aa6b1456b2	Added help text to custom fields headline ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:29:43 -07:00
snipe	b2de0d4ade	Changed “Asset Categories” to “Categories” since there are more than asset categories now ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:29:22 -07:00
Peter Sarossy	cacb707a7f	Added #9355: include Accessories and Consumables on the location reports (#9356)	2021-04-20 14:53:04 -07:00
Supapong Areeprasertkul	b28b245acc	Update labels.blade.php (#8441) ... - Make the qr_size bigger when no barcode printed. - BUG: Missing unit of font size for .qr-text class. - Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)	2021-04-20 14:52:17 -07:00
Michael Pietsch	15e729f4b8	fix css when not runnin in webroot directory (#9445) ... Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>	2021-04-20 14:49:57 -07:00
Masudul Haque Shihab	f3831fe010	Fixed #9447 change route parameter name in locations view (#9456)	2021-04-20 14:49:05 -07:00
snipe	e4acf8d795	Merge remote-tracking branch 'origin/master' into develop	2021-04-20 14:44:01 -07:00
snipe	e8adf8d44c	One more category fix ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 16:57:55 -07:00
snipe	b693e5202b	Check for category name ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 16:54:36 -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
Joly0	31b2287a57	Update print.blade.php (#9426) ... Fixes #9418	2021-04-14 10:20:36 -07:00
Godfrey Martinez	5fab1d6f0d	FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424) ... * git commit -m * added text	2021-04-14 10:19:40 -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
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
Ivan Nieto Vivanco	9cf5fbd675	Logic added to handle when a cloned user is imported via LDAP. (#9429)	2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco	3824a50e8b	Fixes an issue with CSS when the 'skin' value in settings table is empty. (#9423)	2021-04-12 20:37:02 -07:00
snipe	bf2479c5d9	Fixed url to user-ridden style ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 20:36:13 -07:00
snipe	ba92d751a3	Removed depreciated Input:: facade ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 20:28:05 -07:00
Brady Wetherington	792a31cc7f	Merge branch 'develop'	2021-04-06 20:10:22 -07:00
snipe	390403ddb7	Fixed #9370 - listbox custom fields not decryoted on edit ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 05:59:31 -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	09887bdabd	Removed stray opening tag ... Signed-off-by: snipe <snipe@snipe.net>	2021-04-05 21:54:31 -07:00
Godfrey Martinez	f9f8ce6df6	Auditing feature improvement Better mobile [ch14328] (#9181)	2021-04-05 21:53:19 -07:00
Tetrachloromethane250	157d9e4ebb	Added #5977: Add permission to view files attached to licenses (#9264) ... * Add permission to view and modify files for licenses * Actually use the permission	2021-04-05 21:51:47 -07:00
snipe	b9bab05ac3	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/users/print.blade.php	2021-04-05 20:55:49 -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	6f4215cfac	Fixed label name for field_values ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:07:30 -07:00
snipe	b5f7cb534e	Fixed element name ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:02:25 -07:00
snipe	70a7a8f20b	WTF. This shit is haunted. ... Signed-off-by: snipe <snipe@snipe.net>	2021-03-30 08:00:27 -07:00
snipe	a5b67965f2	Fixed CSS path ... (Fixes RB #14746) Signed-off-by: snipe <snipe@snipe.net>	2021-03-30 07:49:30 -07:00
Nikolay Didenko	06e641b782	Do not override per table data-id-cookie-table attribute by current route name globally (#7835)	2021-03-29 20:05:24 -07:00
Marc Leuser	90b7d34c69	Added #6695: add API endpoint for license seats (#8058) ... * remove miselading comment line * added dedicated API endpoint for license seats * don't display a seat name via API it makes no sense and we don't have any particular sorting order so the numbering would be inconsistent anyway * reduce amount of IFs * add sanity checks to show() * fix goofed logging logic * add tests for action log entries	2021-03-29 19:41:26 -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
Ivan Nieto Vivanco	9ed226a0af	Fixes links in Models Actions, and to view the fieldset assigned to that Model. (#9232)	2021-03-01 13:08:29 -08:00
Joel Pittet	c979779249	Fixes a couple blade templates for relative URLs (#9170) ... * Switched branch name to master * Production assets for better contrast in dark mode skins * Fixed #9115: Duplicate column name 'provider' (#9137) * Sigh. Real assets * fix blade templates with missing url() function wrapper for relative URLs * Develop to master (#9195) * Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187) * [FIX] Lite test email won't use the mail component (#9092) * [FIX] Lite test email won't use the mail component * Revert "[FIX] Lite test email won't use the mail component" This reverts commit 6dab9aa1a8. * Fix check for snipeSettings * Remove random text from message template * Revert "Fix check for snipeSettings" This reverts commit 887dcc7bbc. * Fix test notification with setupCompleted Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com> Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com> * Changed branch from develop to master * fix blade templates with missing url() function wrapper for relative URLs * Re-apply patch against develop * Rebase against develop Co-authored-by: snipe <snipe@snipe.net> Co-authored-by: Kevin Köllmann <mail@kevinkoellmann.de> Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com> Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com>	2021-02-26 15:59:36 -08:00
snipe	f37d5d3d03	Fixed #9085 - asset models not showing proper pagination ... Huge thanks to @inietov for catching this one	2021-02-25 16:43:38 -08:00
snipe	57e52f0ba4	Fixed extraneous closing </i>	2021-02-25 13:35:05 -08:00
Oliver Walerys	c3166d491a	[FIX] Lite test email won't use the mail component (#9092) ... * [FIX] Lite test email won't use the mail component * Revert "[FIX] Lite test email won't use the mail component" This reverts commit 6dab9aa1a8. * Fix check for snipeSettings * Remove random text from message template * Revert "Fix check for snipeSettings" This reverts commit 887dcc7bbc. * Fix test notification with setupCompleted	2021-02-23 14:49:40 -08:00
snipe	c8f6318aba	Fixed funky layout in asset model modal window (broken HTML)	2021-02-19 10:51:56 -08:00
snipe	9d50e0e8d0	Fixed weird table formatting in expected checkin report	2021-02-17 13:44:35 -08:00
snipe	9deb4204c8	Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report	2021-02-17 13:41:08 -08:00
Ivan Nieto	12ff465cdb	Added feature: Checkbox Custom Fields as list of values. (#9112) ... * Added functionality for checkboxes in custom fields. Similar to how radio buttons work. * Added the same functionality when the custom fieldset is encrypted. * Added missing bits, so the edit custom assets view shows what values have been already stored in database	2021-02-16 17:20:29 -08:00
snipe	49415806e1	Nicer formatting of the page if custom logout [ch15660]	2021-02-03 14:56:26 -08:00
ThoBur	c40b8334fc	Update edit.blade.php (#8876) ... Fix issue #8518	2021-02-03 11:59:05 -08:00
snipe	985193ffff	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
snipe	fdb5b3baf1	Depreciation detail view fixes [ch15776] (#9059) ... * Allow sorting by months for depreciation list view * Added dataTableLayout to standardize the list display table * Implement the dataTableLayout() on the list view blade * Split the view into tabs so we can combine asset depreciations and license depreciations * Updated depreciation view to use tabbed interface for assets and licenses * Added asset models to depreciation details page * Make asset model category sortable * Added cateory as allowed to be sorted on * Added category sort scope * Removed offset variable * Small fixes to asset modes display in depreciation to bulk edit models	2021-01-27 17:44:05 -08:00
Ivan Nieto	6772835efc	Added support for radio buttons in Custom Fields. (#9053)	2021-01-27 14:41:58 -08:00
snipe	fb482b0dd6	Fixed translation string in Depreciation view [ch15776]	2021-01-27 14:09:01 -08:00
snipe	0031fab0fe	Added termination date, depreciation in license column selection [ch14505] (#9052)	2021-01-27 01:34:32 -08:00
snipe	d19c6ab8e7	Use fadeIn/fadeOut for password reset page for nicer look	2021-01-26 20:05:01 -08:00
snipe	d14b1e3825	Added better visual cues for login (#9051) ... * Added better visual cues for login * Changed box header class to box-header with-border to match other screens * Since we have all.js now, added class=“minimal” to use icheck	2021-01-26 19:57:39 -08:00
snipe	ba12ee9954	Specifically call out username in forgotten password	2021-01-26 18:00:50 -08:00
Lucas Pleß	f3a7467235	Added today as default Date for checkout Form. (#8938)	2021-01-26 12:06:58 -08:00
Ivan Nieto	2da6f9136f	Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989) ... * Add 'Last Audit Date/Next Audit Date' filter to custom report * Added a constraint: cannot require a report with a Last Audit Date in the future.	2021-01-26 12:05:31 -08:00
snipe	75a8639a20	Fixed weird checkbox display ... TODO: fix the 500 on the save	2021-01-12 18:16:42 -08:00
snipe	380c6171b7	Check if the asset is deployed before prompting for an expected checkin date	2021-01-12 18:02:10 -08:00
snipe	d36d6b8e07	Added expected_checkout as editable field in asset edit	2021-01-12 16:48:49 -08:00
snipe	c00a1fa21b	Added new generic datepicker partial	2021-01-12 16:48:32 -08:00
Ivan Nieto	72f9fe444d	Fix for default parameters in JS functions IE (#8973) ... * Small fix for IE which doesn't support default parameters in the function definition * Stylistic changes for better comprehension	2021-01-05 19:25:30 -08: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
snipe	c0aa6c153e	Better callout for warning on api token page	2020-12-09 08:19:04 -08:00
snipe	5f76e03616	Clarified API url info in account > api	2020-12-09 08:14:44 -08:00
snipe	82d8b2ab82	Fixed weird parsing in newer markdown	2020-12-08 20:04:01 -08:00
snipe	4ac15daee7	Fixed #8147 - allow webp image format for public file uploads	2020-12-01 19:06:53 -08:00
snipe	bfc60864dd	Fixed typo on route for licenses	2020-11-30 20:46:45 -08:00
snipe	4882b01787	Added purchase order and order number to user > licenses view	2020-11-30 12:54:15 -08:00
snipe	f475bdbb2d	Fixed #8797 - use html_entity_decode in fullName presenter for User	2020-11-25 08:54:23 -08:00
snipe	6f99ce2b07	Branding page UI improvements (image previews inline)	2020-11-25 00:45:46 -08:00
snipe	76ee5a679b	Fixed #8810 - email logo was not being used in emails	2020-11-25 00:05:02 -08:00
snipe	973eacf6c3	Small fixes for SAML ... The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it. I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)	2020-11-24 13:51:02 -08:00
snipe	b2660002b9	Fixed #8781 - added asset count by status type (#8806)	2020-11-24 12:15:07 -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
snipe	57d6a7d35e	Fixed #8753 - create-asset-from-model did not preselect the model	2020-11-18 13:59:02 -08:00
snipe	2ea805b7ed	Added search/sort by Location OU, added to listing	2020-11-17 22:17:07 -08:00
snipe	68487e1200	Added img-responsive class to preview images	2020-11-17 16:15:25 -08:00
snipe	f19b9a44fc	Fixed #8773 - wrong path for suppliers image on suppliers edit	2020-11-17 16:10:54 -08:00
snipe	4898b58bdb	Fixed #8765 - UI not indicating model is required	2020-11-17 13:40:15 -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	fbaf6e2494	Fixed #8747 - upload path for uploaded images	2020-11-16 16:39:02 -08:00
snipe	1f5bcf2475	Added option to download activity report	2020-11-13 16:25:05 -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	10cadecd14	Moved a few of the user edit fields to make more sense (optional stuff further down)	2020-11-13 11:52:09 -08:00
snipe	07936ea901	Changed asset name to asset tag in maintenances	2020-11-13 03:38:31 -08:00
snipe	df5cc7525e	Merge remote-tracking branch 'origin/develop'	2020-11-12 23:39:09 -08:00
snipe	75b8c3455c	Fixed #8609 - custom fieldsets not draggable anymore (regression)	2020-11-12 23:38:12 -08:00
snipe	81d38a0ded	Fixed #8733 - typo in unaccepted assets report	2020-11-12 23:26:05 -08:00
snipe	b2a8af2fa9	Fixed #8647 - Added additional help info on importer page	2020-11-12 22:46:51 -08:00
snipe	9d2363741e	Improved 2FA reset layout	2020-11-12 22:25:07 -08:00
snipe	9db191f0b2	Fixes for #8732 - Flysystem paths, migrator script	2020-11-12 21:46:06 -08:00
snipe	7765c87387	Fixed #8669 - Allow application/xml in SAML upload in Safari	2020-11-12 18:47:19 -08:00
snipe	caeea9f530	Merge remote-tracking branch 'origin/develop'	2020-11-12 15:27:49 -08:00
snipe	0fdfd013e7	Fixed #8715 - wrong API url for unaccepted assets	2020-11-12 15:26:50 -08:00
Dampfklon	be114176a2	Refactor Expected Checkin Notification into markdown and enable translation (#8236) ... Co-authored-by: snipe <snipe@snipe.net>	2020-11-12 15:09:40 -08:00
Dampfklon	1f9b04405c	Enable translation of accept-asset page (#8237)	2020-11-12 15:07:45 -08:00
Dampfklon	5fb31a5a3f	Use translated salutation from other notifications (#8234)	2020-11-12 15:05:22 -08:00
snipe	5098d69c05	Fixed stupid auto-indent	2020-11-12 14:20:54 -08:00
snipe	b12de13041	Fixed markdown in expiring licenses alert	2020-11-12 14:10:45 -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	8c19b11e73	Fixed #8448 - “undefined” when testing email from quickstart	2020-11-10 01:48:18 -08:00
snipe	178ed82dc4	Fixed [ch9336] - Removed time stamp in Depreciation report	2020-11-10 01:13:13 -08:00
snipe	6757df5a2d	Added Checkout Date Time to Asset Details Page [ch1418]	2020-11-10 01:02:08 -08:00
snipe	895a544d4c	Fixed [ch15347] - added status in Depreciation Report	2020-11-09 23:56:16 -08:00
snipe	1cdf6f8263	Fixed #8673 - added category to accessories listing on Account > Assigned Assets	2020-11-09 23:05:19 -08:00
snipe	ec14a117b7	Display on the API token page the expiration in years ... TODO: Translate these strings	2020-11-09 22:55:27 -08:00
snipe	ede20523f2	Fixed #8680 - location image path	2020-11-09 21:08:19 -08:00
Brady Wetherington	a5423649f4	This is the smallest set of changes we can use to work around a change in functionality ... in Bootstrap Tables. This should remedy some of the issues we've been having with large GET strings being sent to the back-end by the Assets system.	2020-11-09 17:36:07 -08:00
snipe	df5972c4fa	Fixed send creds checkbox in create user form	2020-11-03 13:07:15 -08:00
snipe	44e5fec707	Fixed #8603 - Use correct CSS path for signature-pad.min.css	2020-11-03 10:01:55 -08:00
snipe	c800662f0c	Use username for forgotten password ... Since emails are not required to be unique	2020-11-02 23:57:00 -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	8ee9e5e059	Fixed #8537 - wrong sorting on dashboard	2020-10-23 18:33:10 -07: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
snipe	2aa8e1e76b	Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes ... Fixes #8462 - move accessory notes into pivot table	2020-10-23 14:19:51 -07:00
snipe	b9a9949570	Use the form partial for avatars	2020-10-23 12:09:20 -07:00
snipe	bf9e53fbe7	Updated markdown templates	2020-10-23 06:55:23 -07:00
snipe	f68580b482	Make the email table wider	2020-10-23 06:55:04 -07:00
snipe	aec2f2a249	Fixed #8576 - switch to HTML from markdown ... This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(	2020-10-23 06:54:45 -07:00
snipe	831da2d6d1	New mail vendor files	2020-10-23 06:17:07 -07:00
snipe	2263dae8f4	Fixed HTML	2020-10-23 04:07:55 -07:00
snipe	88f03e6b55	Added last_checkout and notes from pivot for accessories	2020-10-23 00:44:26 -07:00
snipe	5d112be49a	Fixed #8585 - requested assets page blank	2020-10-22 20:08:33 -07:00
snipe	496b176d4e	Fixed #8589 - unable to accept asset	2020-10-22 19:46:40 -07:00
snipe	c71086d2f3	Fixed #8590 - unable to checkin and delete from user view	2020-10-22 19:32:51 -07:00
snipe	a6d0209e93	Fixed #8567 - don’t require model for custom report	2020-10-21 12:23:27 -07:00
Bennett Blodinger	132f296f03	Fix typo	2020-10-20 08:13:52 -05:00
snipe	c1443aa6eb	Pull licenses, accessories, etc - the qty is not accurately reflected	2020-10-19 16:22:55 -07:00
snipe	714ad071ca	Add API endpoint to API keys page ... // TODO - localize it	2020-10-09 14:46:11 -07:00
snipe	c0f9a35dea	Fixed password reset blade with correct username	2020-10-08 18:47:42 -07: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
Bennett Blodinger	83dfa2a28c	Merge branch 'develop' into gmaps-8465	2020-09-22 17:41:38 -05:00
Blodinger	471e0fd2fc	Changes the Google Maps window to be a bit more detailed	2020-09-22 14:30:38 -05: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	b508482441	Merge pull request #8438 from snipe/features/nicer_slack_ui ... Nicer slack settings UI	2020-09-16 12:29:58 -07:00
snipe	30f8431bfb	Added required field indicator	2020-09-16 12:29:20 -07:00
snipe	a3e738b283	Fixed #8442 - wrong CSS url path on /setup	2020-09-16 11:20:59 -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	d5f8e93d7c	Moved delete logo option higher for nicer layout	2020-09-15 19:52:34 -07:00
snipe	303388e1f5	Added a space between favicon help text blocks	2020-09-15 19:50:15 -07:00
snipe	9601bf6edd	Make “remove image” text clearer	2020-09-15 11:57:40 -07:00
snipe	3b6fb68ff1	Added space between padlock icon and demo warning text	2020-09-15 11:40:36 -07:00
snipe	bfd024fdfd	Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled ... Thanks!	2020-09-15 11:21:35 -07:00
snipe	e464f0edf3	Small UI tweaks for kits	2020-09-15 10:15:14 -07:00
Ivan Nieto	291997c915	Change the class of a reusable element so the icon changes from a warning to a padlock	2020-09-15 01:32:46 -05: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	e448b626e2	Removed pagaination from dashboard	2020-09-12 08:37:37 -07:00
snipe	ac2403e8fc	Fixed markdown issue in markdown notifications	2020-09-11 17:12:33 -07:00
snipe	cf545f0ed1	Fixed form layout on accessory checkin page	2020-09-11 16:20:56 -07:00
snipe	d3d64bd85c	Removed asset tag from accessory checkin markdown notification	2020-09-11 16:06:02 -07:00
snipe	0f22cf6807	Fixed #8428 - Added purchase cost column to user tabs	2020-09-11 11:48:51 -07:00
snipe	2f435a57c1	Fixed #8426 - show model number in custom fields model listing	2020-09-11 11:27:30 -07:00
snipe	82e0b1ffd8	Fixed [ch15130] - update the seeder to clear requested assets table	2020-09-08 18:29:02 -07:00
snipe	5b68a321a6	Added comapny formatter to asset maintenance report - fixes [ch15119]	2020-09-08 18:15:45 -07:00
snipe	251ef82741	Added company formatter to asset maintenance report	2020-09-08 18:14:21 -07:00
snipe	d9e7a457d4	Fixed regression on select menus [ch15093] ... Custom report doesn’t pass an $item, so we have to check for that in that required check	2020-09-04 15:43:49 -07:00
snipe	249b9b7509	Fixed [ch15086] - [object object] in companies date displays	2020-09-03 19:40:17 -07:00
snipe	0eeeb24cae	Added data-validation=“required" to appropriate field partials	2020-09-03 16:59:42 -07:00
snipe	0503a51cae	Corrected validation to match model	2020-09-03 16:58:45 -07:00
snipe	c29ec6a100	Removed duplicate state field	2020-09-03 16:00:26 -07:00
snipe	a57ab29af6	Accessibility features for custom fields icons	2020-09-03 15:55:52 -07:00
snipe	b8ddbadd2b	Use icons for 2FA, LDAP, etc info on user view	2020-09-03 15:55:41 -07:00
snipe	3e120812e3	Removed 2FA reset button if the user is not enrolled in 2FA	2020-09-03 15:55:20 -07:00
snipe	3ea3e8b856	Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]	2020-09-03 15:12:51 -07:00
snipe	fb59405a87	User view can t be loaded [ch15079]	2020-09-03 14:07:30 -07:00
Ivan Nieto	3fcd83c499	Fixes some errors in forms using the deprecated Input:: facade	2020-09-03 13:42:33 -05:00
snipe	ed79eacb9d	Updated help text	2020-08-31 19:55:30 -07:00
snipe	a64e1be278	Fixed Input:: () vs request()	2020-08-31 17:18:09 -07:00
snipe	13216b8860	Fixed pGenerator (again)	2020-08-31 17:17:51 -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	9c8ca6af21	Squashed commit of the following: ... commit e321aeabae Merge: 8ec99ff43 37568ae9e Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.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/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.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/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.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 # routes/web/fields.php # tests/unit/UserTest.php commit 37568ae9ec Merge: 01a832169 32ad9050c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit 32ad9050cf Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit 01a832169c Merge: bcad49ce7 3c6883489 Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit 3c6883489c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit bcad49ce79 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit b5acca89d7 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit e52919cf1b Merge: 714576be4 29f3a5c48 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit 29f3a5c48f Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit 134e8e6fb9 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit 714576be45 Merge: b999c50a2 512899294 Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit 5128992940 Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit 0291323502 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit e0f6f9b839 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit f1a6308002 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit b999c50a2e Merge: 9ca20e496 e3906b245 Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit e3906b245c Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit 9ca20e4964 Merge: e0644dbbf 456a74d88 Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit 456a74d88c Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit 799c059070 Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit c62d43a778 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit b725bd0fae Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit e0644dbbf6 Merge: 5b6925b00 004ecad05 Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit 5b6925b00c Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit df17a859bf Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit 24c43056ba Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit 606b7e905d Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit d73ddad477 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit 9a39cf721e Merge: 7410b1683 8994f3e15 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit 7410b16835 Merge: e955c983a b09e7d19b Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit 8994f3e15e Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit d23f1a77ca Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit e955c983a3 Merge: 2fa17ac18 eed41e454 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit b09e7d19b3 Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit 2fa17ac185 Merge: b90515437 3b1e46f72 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit 3b1e46f72b Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit 0c1a1de2a2 Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit 20c9ae5818 Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit eed41e4549 Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit b750f4754f Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit c17a06792a Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit 4f76cc6cfb Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit b905154373 Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit daf748e531 Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit 799a93c46a Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit 34aa12e229 Merge: 81a633288 897757bd0 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit 897757bd04 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit c7125c3937 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit 81a6332889 Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit 6e563f6e4b Merge: 5320f5c67 7f69ae953 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 5320f5c67c Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit 7f69ae953b Merge: c79f8c1ba 17f6fbabf Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 17f6fbabfa Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit c79f8c1baf Merge: 12c92e30b 536401fe0 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit e7a820f7c9 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 12c92e30b7 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit fd10b755b0 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit dbbb7680d9 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit cf0dd5bbad Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit 25e53d8c7f Merge: ec6ed256f 89d433b41 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit 89d433b41a Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit e2570ada6f Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit 45afe725a1 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit 536401fe0f Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit ec6ed256fb Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit 2aaa7bed2d Merge: 339bdddc3 cc9f1577a Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit cc9f1577a4 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit ab1fe8be0c Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit 339bdddc38 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit 35b9cf4b70 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit 7ccb41371e Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit 2e60a457bf Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit 2390d2160b Merge: b42801f6a 00b051b8c Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit 00b051b8c7 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit 05b3a9ad7e Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit 4fb880384f Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit 43042ad841 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit a716382ac4 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit 36c8f7f4f1 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit b42801f6ae Merge: de4934f21 946129f20 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit 946129f206 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit b941ef1e08 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit d1aa11ec89 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit de4934f21d Merge: af06e4205 b10076b01 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commit b10076b015 Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit af06e42056 Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit 9a2440dc4b Merge: beae8efb2 2ac1c1636 Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit 2ac1c1636c Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit 004ecad059 Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit beae8efb21 Merge: d14ab7e3e 9839e5e56 Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit 9839e5e566 Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit d14ab7e3e1 Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commit e7f74d94c1 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit e97cf011b6 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit ed23505054 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit 001e721530 Merge: f88683766 8210da6e8 Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit 8210da6e82 Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit f88683766b Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commit e4385c0f8c Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit 0550fe0ffa Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit 7fb3a9b82c Merge: 9a2ed804c ecb1e87fe Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit ecb1e87fe6 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit f43df5f041 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit 95cc48e422 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit 9a2ed804ca Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commit d20fad28e5 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commit ae813ddf75 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit bb42109c0c Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commit f46ecf8ec0 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commit b9e821c0e6 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit 9ee28c7513 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit 1a8ba06702 Merge: 0fd232e70 ee4d69b1c Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 0fd232e70d Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commit ee4d69b1c5 Merge: 31c535094 d1ad11194 Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit d1ad111949 Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit 31c5350941 Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit 7eb70e17e0 Merge: 5bb4f271a 3dfcb4699 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit 3dfcb46991 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit 96eb96f964 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commit a2f08bd3ba Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commit e009fbe59f Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit 5bb4f271aa Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>	2020-08-31 12:17:19 -07:00
snipe	e1cc003cec	Fixed backup urls for download	2020-08-28 18:22:37 -07:00
snipe	d25a05d748	Misc Flysystem/image upload request fixes	2020-08-26 11:53:36 -07:00
snipe	f385f3e928	Fixed user image upload ... TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images	2020-08-26 02:30:23 -07:00
snipe	a90d2ba077	Fixed suppliers upload	2020-08-24 18:53:33 -07:00
snipe	232e3f30aa	Fixed accessories “current image” path in edit form	2020-08-24 14:30:55 -07:00
Michael Pietsch	4f5374b2e8	enable use custom file based saml certificate/private key	2020-08-14 12:25:00 +02:00
snipe	19d8d7b146	Updated components and consumables to use storage facade	2020-08-12 13:02:54 -07:00
snipe	5b6925b00c	Removed debugging :(	2020-08-04 21:00:37 -07:00
snipe	df17a859bf	Changed modal IDs so manager creation modal works on user creation main page	2020-08-04 20:59:54 -07:00
snipe	24c43056ba	Moved pGenerator script to default layout footer ... This fixes an issue where the password generator wouldn’t load in a modal in Chrome	2020-08-04 20:58:28 -07:00
snipe	4e0a9c7a94	Fart fix ... I just…. don’t ask.	2020-08-03 12:35:34 -07:00
snipe	6a089f86f8	Fixed pathing for accessories	2020-08-03 11:17:56 -07:00
snipe	502b3c50a9	Fixed upload preview (fixed regression from #6736) ... This change appears to have been stomped on in one of the merges. :(	2020-07-31 14:36:50 -07:00
snipe	3e62a6ea2d	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2020-07-31 11:01:35 -07:00
snipe	eed41e4549	Moved address down further, fixed broken HTML	2020-07-21 16:57:32 -07:00
snipe	b750f4754f	Added city to bulk user importer	2020-07-21 16:49:54 -07:00
snipe	b905154373	Fixed #8247 - added notes field to user details display	2020-07-20 14:29:32 -07:00
snipe	81a6332889	Removed license ID from seats table cookie info ... This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses	2020-07-14 13:55:38 -07:00
Ivan Nieto	8fd4529fad	Change the form input name for serials in the view	2020-07-13 13:49:21 -05:00
snipe	12c92e30b7	Show whether or not the user was imported via LDAP in the view page	2020-07-10 16:21:27 -07:00
snipe	fd10b755b0	Removed the sr-only tag in table headers ... It was breaking Bootstrap Tables column selector :(	2020-07-10 11:30:01 -07:00
Sean Borg	567a9639f4	Enhanced #5762 Able to bulk edit expected checkin date ... In light of the need to edit 500+ devices #5762 (comment) I added the expected checkin date to the bulk edit page for assets	2020-07-10 19:21:34 +01:00
Sean Borg	7a433f8598	Updated purchase date format in hardware/bulkedit ... The Purchase date box in hardware/bulkedit was a different style to the normal hardware/{id}/edit It also prevents a strange bug I see in firefox when clicking the old datepicker it presented 2 datepicker boxes	2020-07-10 19:21:22 +01:00
snipe	b941ef1e08	Pulled CSS font awesome styles out of the blade and into overrides.css	2020-06-22 20:41:40 -07:00
Godfrey M	b10076b015	corrected an error where font-size for labels were static in settings.	2020-06-22 17:04:39 -07:00
snipe	a7eb89f6b6	Misc fixes for flysystem paths	2020-06-16 16:06:25 -07:00
snipe	7a785b4952	Updated a few flysystem settings ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-28 01:54:29 -07:00
Godfrey M	9839e5e566	adjusted for all label text, removed local variable	2020-05-27 12:27:40 -07:00
snipe	5b4e4c8dcd	Merge pull request #8061 from Godmartinz/develop ... fixed a table header error	2020-05-26 19:52:14 -07:00
Godfrey M	e7f74d94c1	Label_Woes	2020-05-26 17:22:45 -07:00
Godfrey M	e97cf011b6	Label_Woes	2020-05-26 17:15:39 -07:00
Godfrey M	ed23505054	Label_Woes	2020-05-26 17:10:45 -07:00
Daniel Meltzer	7ea862787c	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
Daniel Meltzer	7a76cb08a0	We accept xlsx in uploads	2020-05-23 11:36:47 -04:00
Daniel Meltzer	8210da6e82	Fix Missing Category selection in Asset Model Modal dialog. ... A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.	2020-05-20 10:29:27 -04:00
Daniel Meltzer	6a80f95769	Fix Missing Category selection in Asset Model Modal dialog. ... A select html tag needs a full closing tag. <select /> is not valid. This was causing the select2 js to barf and eat additional information.	2020-05-20 10:23:04 -04:00
Godfrey M	edd4797178	fixed a table header error	2020-05-19 16:59:09 -07:00
Daniel Meltzer	a6f90cb3fc	Assorted licenses UI fixes while testing. ... * Rename licenses route checkin parameter to clarify it's purpose and fix incorrect route in users view page. * Checkin note can be nullable for checking in a license. * License Seat view was only showing 20 license seats due to faulty transformer logic.	2020-05-12 14:38:21 -04:00
snipe	9a2ed804ca	Fixed mismatched HTML header tags ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:28:42 -07:00
snipe	d20fad28e5	Use more modern request helper ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:28:24 -07:00
snipe	9ee28c7513	Switched to use info instead of danger on undeployable statuses ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 18:07:02 -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	8ecb7969df	Fixed incorrect route for saving groups ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-01 01:26:15 -07:00
snipe	31c5350941	Fixed incorrect route for groups edit ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-01 01:05:48 -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	3dfcb46991	Minor formatting changes ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:41:08 -07:00
snipe	96eb96f964	Removed stray val (typo) ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:27:00 -07:00
snipe	a2f08bd3ba	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:08:54 -07:00
snipe	e009fbe59f	Converted table heading icons in People to CSS glyphs ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:04:53 -07:00
snipe	5bb4f271aa	Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 00:47:19 -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