2321: Fixed merge

Author: tuj

.docker/vhost.conf

@@ -7,6 +7,10 @@ server {
         proxy_set_header   X-Forwarded-For $remote_addr;
         proxy_set_header   Host $http_host;
         proxy_pass         http://node:3000;
+
+        add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
+        add_header Pragma "no-cache";
+        add_header Expires "0";
     }
 
     location /admin/ws {

CHANGELOG.md

@@ -7,8 +7,24 @@ All notable changes to this project will be documented in this file.
 
 - [#264](https://github.com/os2display/display-admin-client/pull/264)
   - Added checkbox options component for use in calendar modifiers.
+- [#268](https://github.com/os2display/display-admin-client/pull/268)
+  - Added feed source UI.
+
+## [2.1.1] - 2024-10-23
+
+- [#266](https://github.com/os2display/display-admin-client/pull/266)
+  - Fixed search from local storage.
+- [#265](https://github.com/os2display/display-admin-client/pull/265)
+  - Add no-cache directive
+- [#263](https://github.com/os2display/display-admin-client/pull/263)
+  - Added prefix to local storage keys.
+- [#262](https://github.com/os2display/display-admin-client/pull/262)
+  - Add multi select styling for `invalid` state 
+  - Add possibility of sending error via props to multiselect component
+  - Add validation checking if layout is selected on screen before save
+  - Add validation checking if template is selected on slide before save
 - [#260](https://github.com/os2display/display-admin-client/pull/260)
-  - Bug in multiselect, fixed by removing duplicates by key both `@id`and `id`
+  - Bug in multiselect, fixed by removing duplicates by key both `@id`and `id` 
 - [#259](https://github.com/os2display/display-admin-client/pull/259)
   - Add saving of playlists/groups with screen (as opposed to _after_)
   - Clean up `screen-manager.jsx`