Resolve rebase conflicts #3157

MaibornWolff · Nov 8, 2023 · 2bbd47e · 2bbd47e
1 parent 2a36c29
commit 2bbd47e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ## [unreleased] (Added 🚀 | Changed | Removed 🗑 | Fixed 🐞 | Chore 👨‍💻 👩‍💻)
 
+### Removed 🗑
+
+-   Deprecated download button removed (functionality has been replaced by custom views) [#3398](https://github.com/MaibornWolff/codecharta/pull/3398)
+
 ### Fixed 🐞
 
 -   Fix an issue with web demo on Safari showing a white screen and not loading [#3396](https://github.com/MaibornWolff/codecharta/pull/3396)

diff --git a/gh-pages/_docs/06-02-user-controls.md b/gh-pages/_docs/06-02-user-controls.md
@@ -15,7 +15,7 @@ The controls that are available to you are:
 | #   | Type            | Action                                                                                                                                                                                                                                                           |
 | --- | --------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | 1   | Settings        | Load cc.json map or multiple maps (_hold shift_).                                                                                                                                                                                                                |
-| 2   | Settings        | Download the current map as a JSON-file. **Deprecation Warning!** This feature will soon be removed. It is already replaced by the controls nr. 15 and 16.                                                                                                       |
+| 2   | Settings        | **Removed!** This button no longer exists and has been replaced by the controls Nr. 15 and 16.                                                                                                                                                                   |
 | 3   | Settings        | Export screenshot as a file.                                                                                                                                                                                                                                     |
 | 4   | Settings        | Copy the names of files with highest metric values to clipboard.                                                                                                                                                                                                 |
 | 5   | Settings        | Download model as stl-file for 3D-printing.                                                                                                                                                                                                                      |

diff --git a/gh-pages/_docs/06-04-custom-view.md b/gh-pages/_docs/06-04-custom-view.md
@@ -3,7 +3,7 @@ permalink: /docs/custom-view/
 title: "Custom View"
 ---
 
-> Deprecation Note: Custom Views will replace the download button in Q2 2023. The functionality of downloading a .cc.json file including e.g. currently blacklisted items or marked packages has been replaced and extended by the Custom Views feature. Now, it is possible to save and download multiple Custom Views for a map with actually all current settings. They can be activated upon a loaded map to replay the stored settings by not changing the original cc.json file. Therefore, the download button will be removed as mentioned.
+> Deprecation Note: Custom Views have replaced the download button in Version 1.120.1. The functionality of downloading a .cc.json file including e.g. currently blacklisted items or marked packages has been replaced and extended by the Custom Views feature. Now, it is possible to save and download multiple Custom Views for a map with actually all current settings. They can be activated upon a loaded map to replay the stored settings by not changing the original cc.json file.
 
 Custom Views allow you to save and upload your individual display configurations for certain maps, instead of modifying
 and downloading an entire .cc.json file. To save new configurations there is a