Merge tag 'v2.2.1'

# Conflicts:
#	.docker/symfony.conf
#	VERSION
#	templates/projects/build/build.html.twig
#	templates/projects/info/_builds.html.twig

docs/usage/bom_import.md

@@ -34,3 +34,12 @@ select the BOM file you want to import and some options for the import process:
   has a different format and does not work with this type.
   You can generate this BOM file by going to "File" -> "Fabrication Outputs" -> "Bill of Materials" in Pcbnew and save
   the file to your desired location.
+* **KiCAD Schematic BOM (CSV file)**: A CSV file of the Bill of Material (BOM) generated
+  by [KiCAD Eeschema](https://www.kicad.org/).
+  You can generate this BOM file by going to "Tools" -> "Generate Bill of Materials" in Eeschema and save the file to your
+  desired location. In the next step you can customize the mapping of the fields in Part-DB, if you have any special fields
+  in your BOM to locate your fields correctly.
+* **Generic CSV file**: A generic CSV file. You can use this option if you use some different ECAD software or wanna create
+  your own CSV file. You will need to specify at least the designators, quantity and value fields in the CSV. In the next
+  step you can customize the mapping of the fields in Part-DB, if you have any special fields in your BOM to locate your
+  parts correctly.

docs/usage/console_commands.md

@@ -66,8 +66,16 @@ docker exec --user=www-data partdb php bin/console cache:clear
 * `partdb:migrations:import-partkeepr`: Imports a mysqldump XML dump of a PartKeepr database into Part-DB. This is only
   needed for users, which want to migrate from PartKeepr to Part-DB. *All existing data in the Part-DB database is
   deleted!*
+* `settings:migrate-env-to-settings`: Migrate configuration from environment variables to the settings interface.
+The value of the environment variable is copied to the settings database, so the environment variable can be removed afterwards without losing the configuration.
 
 ## Database commands
 
 * `php bin/console doctrine:migrations:migrate`: Migrate the database to the latest version
 * `php bin/console doctrine:migrations:up-to-date`: Check if the database is up-to-date
+
+## Attachment commands
+
+* `php bin/console partdb:attachments:download`: Download all attachments, which are not already downloaded, to the
+  local filesystem. This is useful to create local backups of the attachments, no matter what happens on the remote and
+ also makes pictures thumbnails available for the frontend for them

docs/usage/getting_started.md

@@ -12,11 +12,19 @@ Before starting, it's useful to read a bit about the [concepts of Part-DB]({% li
 1. TOC
 {:toc}
 
-## Customize config files
+## Customize system settings
 
-Before you start creating data structures, you should configure Part-DB to your needs by changing possible configuration
-options.
-This is done either via changing the `.env.local` file in a direct installation or by changing the env variables in
+Before starting creating datastructures, you should check the system settings to ensure that they fit your needs.
+After login as an administrator, you can find the settings in the sidebar under `Tools -> System -> Settings`.
+![image]({% link assets/getting_started/system_settings.png %})
+
+Here you can change various settings, like the name of your Part-DB instance (which is shown in the title bar of the
+browser), the default language (which is used if no user preference is set), the default timezone (which is used to
+display times correctly), the default currency (which is used to display prices correctly), and many more.
+
+Some more fundamental settings like database connection, mail server settings, SSO, etc. are configured via environment variables.
+Environment variables also allow to overwrite various settings from the web interface.
+Environment variables can be changed by editing the `.env.local` file in a direct installation or by changing the env variables in
 your `docker-compose.yaml` file.
 A list of possible configuration options can be found [here]({% link configuration.md %}).
 
@@ -44,8 +52,8 @@ used.
 
 ## (Optional) Customize homepage banner
 
-The banner which is shown on the homepage, can be customized/changed by changing the `config/banner.md` file with a text
-editor. You can use markdown and (safe) HTML here, to style and customize the banner.
+The banner which is shown on the homepage, can be customized/changed via the homepage banner setting in system settings. 
+You can use markdown and (safe) HTML here, to style and customize the banner.
 You can even use LaTeX-style equations by wrapping the expressions into `$` (like `$E=mc^2$`, which is rendered inline:
 $E=mc^2$) or `$$` (like `$$E=mc^2$$`) which will be rendered as a block, like so: $$E=mc^2$$
 
@@ -202,4 +210,4 @@ later.
 You can choose from your created datastructures to add manufacturer information, supplier information, etc. to the part.
 You can also create new datastructures on the fly, if you want to add additional information to the part, by typing the
 name of the new datastructure in the field and select the "New ..." option in the dropdown menu. See [tips]({% link
-usage/tips_tricks.md %}) for more information.
+usage/tips_tricks.md %}) for more information.

docs/usage/import_export.md

@@ -20,7 +20,7 @@ Part-DB. Data can also be exported from Part-DB into various formats.
 > individually in the permissions settings.
 
 If you want to import data from PartKeepr you might want to look into the [PartKeepr migration guide]({% link
-upgrade_legacy.md %}).
+upgrade/upgrade_legacy.md %}).
 
 ### Import parts
 
@@ -142,6 +142,9 @@ You can select between the following export formats:
   efficiently.
 * **YAML** (Yet Another Markup Language): Very similar to JSON
 * **XML** (Extensible Markup Language): Good support with nested data structures. Similar use cases as JSON and YAML.
+* **Excel**: Similar to CSV, but in a native Excel format. Can be opened in Excel and LibreOffice Calc. Does not support nested
+  data structures or sub-data (like parameters, attachments, etc.), very well (many columns are generated, as every
+  possible sub-data is exported as a separate column).
 
 Also, you can select between the following export levels:
 
@@ -158,4 +161,4 @@ information, this can lead to very large export files.
 You can export parts in all part tables. Select the parts you want via the checkbox in the table line and select the
 export format and level in the appearing menu.
 
-See the section about exporting data structures for more information about the export formats and levels.
+See the section about exporting data structures for more information about the export formats and levels.

docs/usage/information_provider_system.md

@@ -68,6 +68,13 @@ If you already have attachment types for images and datasheets and want the info
 can
 add the alternative names "Datasheet" and "Image" to the alternative names field of the attachment types.
 
+## Bulk import
+
+If you want to update the information of multiple parts, you can use the bulk import system: Go to a part table and select
+the parts you want to update. In the bulk actions dropdown select "Bulk info provider import" and click "Apply".
+You will be redirected to a page, where you can select how part fields should be mapped to info provider fields, and the 
+results will be shown.
+
 ## Data providers
 
 The system tries to be as flexible as possible, so many different information sources can be used.
@@ -80,6 +87,11 @@ Normally the providers utilize an API of a service, and you need to create an ac
 Also, there are limits on how many requests you can do per day or month, depending on the provider and your contract
 with them.
 
+Data providers can be either configured in the system settings (in the info provider tab) or on the settings page which is
+reachable via the cogwheel symbol next to the provider in the provider list. It is also possible to configure them via
+environment variables. See below for the available configuration options. API keys configured via environment variables
+are redacted in the settings interface.
+
 The following providers are currently available and shipped with Part-DB:
 
 (All trademarks are property of their respective owners. Part-DB is not affiliated with any of the companies.)
@@ -127,9 +139,6 @@ You must create an organization there and create a "Production app". Most settin
 grant access to the "Product Information" API.
 You will get a Client ID and a Client Secret, which you have to put in the Part-DB env configuration (see below).
 
-**Attention**: Currently only the "Product Information V3 (Deprecated)" is supported by Part-DB. 
-Using "Product Information V4" will not work.
-
 The following env configuration options are available:
 
 * `PROVIDER_DIGIKEY_CLIENT_ID`: The client ID you got from Digi-Key (mandatory)

docs/usage/tips_tricks.md

@@ -95,4 +95,9 @@ It is only be shown to users which has the `Show available Part-DB updates` perm
 For the notification to work, Part-DB queries the GitHub API every 2 days to check for new releases. No data is sent to
 GitHub besides the metadata required for the connection (so the public IP address of your computer running Part-DB).
 If you don't want Part-DB to query the GitHub API, or if your server can not reach the internet, you can disable the
-update notifications by setting the `CHECK_FOR_UPDATES` option to `false`.
+update notifications by setting the `CHECK_FOR_UPDATES` option to `false`.
+
+## Internet access via proxy
+If you server running Part-DB does not have direct access to the internet, but has to use a proxy server, you can configure
+the proxy settings in the `.env.local` file (or docker env config). You can set the `HTTP_PROXY` and `HTTPS_PROXY` environment
+variables to the URL of your proxy server. If your proxy server requires authentication, you can include the username and password in the URL.