snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00

Author	SHA1	Message	Date
Godfrey M	877b1bd0a3	re-adds Request::is to setting categories	2022-05-18 14:31:03 -07:00
Godfrey M	eaeb74c576	readded comment	2022-05-18 13:13:38 -07:00
Godfrey M	23891054dc	removed dead space and unused namespace	2022-05-18 13:11:20 -07:00
Godfrey M	cfc4c58da3	fixes the Settings Tree menu to remain active when opened	2022-05-18 13:06:06 -07:00
Godfrey M	07679aa376	settings treeview won't stay active. still experimenting with potential solutions	2022-05-18 08:40:37 -07:00
snipe	4078e4e323	Added spinner onClick for file upload button on backups Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 02:40:32 -07:00
snipe	ceffbb950f	Fixed #11120 - custom fields not showing when textarea is present as field type Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 00:47:22 -07:00
snipe	0f9559c1ff	Fixed #11124 - updated maintenance page Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 19:01:37 -07:00
Travers Carter	1fc0adf7b7	Fixed #11126 : don't entitise custom CSS on the labels view	2022-05-18 00:16:18 +10:00
snipe	a973c0626e	Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups We inadvertently used the wrong label for one of the headers	2022-05-16 17:02:31 -07:00
Brady Wetherington	213d990e47	We inadvertently used the wrong label for one of the headers on the backups page	2022-05-16 17:00:22 -07:00
snipe	925529923a	Fixed #11112 - use correct formatter for locations on dashboard Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 16:50:47 -07:00
snipe	ed8e82a606	Removed sr-only class for now - not sure why it’s interfering with the submit button JS Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 11:02:02 -07:00
snipe	91fb27ee00	Adds encrypted status to custom fields overview Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:20:04 -07:00
snipe	5f1f6baee9	Fixed unrelated typo Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:19:12 -07:00
snipe	3fe0e04d52	Fix roite for people file deletion Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 08:25:22 -07:00
snipe	3a31104b5c	Fixed #11052 - add file sizes to upload displays Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 19:33:14 -07:00
Brady Wetherington	b6284e6651	Fix 'cancel' button in two-factor screen	2022-05-13 14:49:37 -07:00
snipe	d8a4509b22	Fix logout on 2fa Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 14:36:20 -07:00
snipe	eccc5e7cf0	Make logout a post on 2FA cancel Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 13:35:13 -07:00
snipe	b36bfad0ca	Set maxlength on password confirmation form element Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:27:47 -07:00
snipe	93454decec	Fixed broken quotes Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:14:53 -07:00
snipe	deb2d958d8	Sets maxlength of user fields to 191 Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -07:00
snipe	714f6d80f2	Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape Bootstrap tables export as landscape	2022-05-12 09:28:47 -07:00
Godfrey M	83d0743ab8	saves bootstrap pdf tables in landscape	2022-05-12 09:18:44 -07:00
snipe	91cc08d3fb	Merge pull request #11050 from uberbrady/fix_encrypted_textareas Make sure to decrypt Textareas as well as input type=text	2022-05-11 19:03:02 -07:00
Godfrey M	8ebe64e630	fixes final visual issue	2022-05-11 12:13:36 -07:00
Brady Wetherington	e3696ff84c	Make sure to decrypt Textareas as well as input type=text	2022-05-10 18:39:03 -07:00
snipe	780222d372	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # resources/views/users/print.blade.php	2022-05-10 17:26:26 -07:00
Godfrey M	c07a244bab	fixes 1/2 visual issues, adds history tab to accessories	2022-05-10 11:20:42 -07:00
snipe	304cd75af5	Fixed extra divs Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:44 -07:00
snipe	59a0f4722b	Use partial for asset bulk edit Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:35 -07:00
snipe	418a797e7e	Use partial for asset bulk edit Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:29 -07:00
snipe	0c20543c49	Remove conflicting toolbar call in model listing Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:58 -07:00
snipe	fe98e505fe	Use the new partial for bulk asset edit Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:31 -07:00
snipe	78a9c16761	Minor formatting improvements Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:10 -07:00
snipe	c4bf0045c8	Fixed stray < tag Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:55 -07:00
snipe	c64f34ebcc	Check the "do not change” radio button by default Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:31 -07:00
snipe	cf0548bd1f	Create a new partial for asset bulk actions Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:11:52 -07:00
snipe	caef98d36d	Patched #11025 to develop Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 02:06:12 -07:00
snipe	fba731ac1c	Missed a few hard coded english strings Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 02:01:17 -07:00
snipe	784bf4d784	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js	2022-05-06 01:52:43 -07:00
snipe	39ee825ba2	Fixed html lang specification Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 01:32:20 -07:00
snipe	c0e9393092	Fixed #10890 - use translation strings in user asset printout Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 01:30:58 -07:00
snipe	3a415b2fce	Use full app_url in favicon paths Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 00:19:32 -07:00
snipe	5370c2ca42	Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all [Fix] changes the query for the accept signature on print blade	2022-05-05 13:32:37 -07:00
snipe	953b3a8d6e	Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 Merge master into develop for RC 6.0.0-8	2022-05-05 10:53:17 -07:00
Johnson Yi	281c6df7b3	Customize login page when REQUIRE_SAML is enabled	2022-04-29 15:35:40 +00:00
snipe	edab4e1371	Uses str_slug for filename for JS export (like we do elsewhere) Signed-off-by: snipe <snipe@snipe.net>	2022-04-28 21:55:26 +01:00
snipe	9aac1cbba4	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php	2022-04-28 17:49:06 +01:00
Achmad Fienan Rahardianto	dafe353050	Implements #8155 to improve the workflow during asset creation - adding 2 options to hide optional information	2022-04-23 14:41:38 +07:00
Godfrey M	380cb38b7d	changes the query for the accept signature on print blade	2022-04-14 17:17:28 -07:00
Brady Wetherington	4db7cb0e21	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:37:32 +01:00
Brady Wetherington	5a776af091	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:27:06 +01:00
snipe	01342ca266	Fixed activity report Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end Cleaning up routes to match laravel-scim-server's recommended implementation Some actually working changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	08588a2e6a	Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view Fixes #10898 (invalid consumable date time info in user view)	2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto	231a34ace3	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00
snipe	8ccf148799	Fixed #10881 - bad merge with bootstrap-tables changes Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 22:57:00 +01:00
snipe	b2056816c9	Use the same string for both radio buttons in bulk user edit Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:45:55 +01:00
snipe	a937bd34f6	Merge master back down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
snipe	7941a88623	Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets Fix #10810 unaccepted assets	2022-03-29 12:10:37 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync This looks good, thanks!	2022-03-29 12:06:01 +01:00
Brady Wetherington	e50ad8a442	Don't crash JS when there are no data-export-options (as is true in Dashboard)	2022-03-27 07:18:12 +01:00
Godfrey Martinez	fe6a6740db	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
snipe	729b23c0cf	Merge pull request #10857 from uberbrady/fix_bs_tables_export_options Fix bs tables export options	2022-03-22 17:03:18 +00:00
Brady Wetherington	af9f3d5e1e	Clean up the bootstrap table export options	2022-03-22 16:05:08 +00:00
Brady Wetherington	00ca30a205	WIP: fix bootstrap table export options	2022-03-22 15:12:11 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -06:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
Godfrey M	220df9710e	adds most of the fields for an accessory eula agreement pdf	2022-03-21 09:18:29 -07:00
snipe	760b78b584	Fixed #10819 - use full url for label barcodes I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes Signed-off-by: snipe <snipe@snipe.net>	2022-03-21 13:57:18 +00:00
snipe	42220cc566	Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving Fixes Customfields with boolean format not saving [ch-9973]	2022-03-19 22:10:54 +00:00
Ivan Nieto Vivanco	6ed9ed0e79	Add field type boolean to custom fields list all	2022-03-16 17:21:05 -06:00
Godfrey M	b2e78e3382	formats most of the pdf blade	2022-03-16 15:53:32 -07:00
Godfrey M	5fcc3c39f3	routes eula agreements for download correctly to the asset history	2022-03-16 11:56:56 -07:00
snipe	9db8bd782d	Merging master down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 18:02:07 +00:00
Godfrey M	6386fa1c5e	clean up	2022-03-16 09:54:10 -07:00
snipe	781b426018	Fixed #10826 - parse error on translation string for print all assets Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 08:50:47 -07:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07:00
Dampfklon	29e1d657e3	fix missed rename	2022-03-11 21:33:25 +01:00
Godfrey M	e1a6a2afc6	adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet	2022-03-10 12:15:50 -08:00
Ivan Nieto Vivanco	86bd90c564	Show icons in the asset view for boolean customfields	2022-03-09 21:46:19 -06:00
snipe	c817daa4da	Merge pull request #10767 from uberbrady/fix_double_request_datatable One attempt to fix the 'datatable double-request' problem.	2022-03-08 20:34:15 -08:00
Godfrey M	59c583ac74	adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI	2022-03-08 16:42:27 -08:00
Ivan Nieto Vivanco	657cfddd3c	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:28:13 -06:00
Ivan Nieto Vivanco	2410b1a146	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:25:15 -06:00
snipe	def570db4b	Finer grain for > 200 Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:51:49 -08:00
snipe	fcb81b9505	Use the max_results env value in the paginator Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:39:39 -08:00
Brady Wetherington	8d49d35463	Remove another data-toggle="table" - possibly the last one	2022-03-07 12:52:57 -08:00
Brady Wetherington	6f3e9033c2	One attempt to fix the 'datatable double-request' problem.	2022-03-07 12:52:57 -08:00
snipe	9a358087ec	Add remote user to bulk edit Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:47:23 -08:00
snipe	06a05e6340	Added remote to view Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:37:28 -08:00
snipe	43c1949092	Add remote option to user Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -08:00
snipe	a9069e65e5	Don’t show groups in menu if there are none yet Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:39:39 -08:00
snipe	1400c610a1	Use correct button translation Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:22:44 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
snipe	5266b2c71f	Added notes field to view blades Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:30:27 -08:00
snipe	dc1e0ecdb7	Merge pull request #10739 from insert-waffle/fixes/prevent_double_values_email Feature: Prevent showing of double values in a checkin or checkout email	2022-03-02 14:28:22 -08:00
Jens Maes	9b88f650d2	Prevents showing double values - If the asset name and tag are the same, the tag does not get shown in an email. - If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.	2022-02-25 08:19:46 +01:00
Jens Maes	57e93e4e92	Fixes 10708: change size of fa-hdd to 2x	2022-02-24 11:05:40 +01:00
Jens Maes	c0893c44a3	Fixes 10708: Removed line heigt from manufacturer list item.	2022-02-24 10:29:39 +01:00
snipe	42fcd29200	Fixed #10436 on master, applies #10449 Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 21:06:54 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
Jens Maes	e5f6b48115	🧑‍🔧 Added 2 breaks in message.blade.php The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.	2022-02-18 10:27:12 +01:00
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

... 3 4 5 6 7 ...

2231 commits