Skip to content

Commit 0e9f0e6

Browse files
committed
Merge branch 'develop' into feature/eventdatabasen-v2
2 parents 8e77f34 + c01afab commit 0e9f0e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+17819
-15658
lines changed

.eslintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
"plugin:prettier/recommended"
88
],
99
"ignorePatterns": ["*.yml"],
10+
"globals": {
11+
"window": true,
12+
"localStorage": true,
13+
"document": true
14+
},
1015
"parser": "babel-eslint",
1116
"parserOptions": {
1217
"sourceType": "module",

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
docker network create frontend
3131
docker compose run --rm node yarn install
32-
docker compose run --rm node yarn check-coding-standards
32+
docker compose run --rm node yarn check-coding-standards-actions
3333
3434
playwright-tests:
3535
name: Playwright

CHANGELOG.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
55

66
## [Unreleased]
77

8+
- [#273](https://github.com/os2display/display-admin-client/pull/273)
9+
- Fixed calendar api feed source config endpoint.
10+
- [#272](https://github.com/os2display/display-admin-client/pull/272)
11+
- Fixed feed source selector.
12+
- [#264](https://github.com/os2display/display-admin-client/pull/264)
13+
- Added checkbox options component for use in calendar modifiers.
14+
- Fixed multiselect when more than one feed source of the given type is installed.
15+
- Fixed github action to fail on warnings.
16+
- [#268](https://github.com/os2display/display-admin-client/pull/268)
17+
- Added feed source UI.
18+
819
## [2.1.1] - 2024-10-23
920

1021
- [#266](https://github.com/os2display/display-admin-client/pull/266)
@@ -20,8 +31,6 @@ All notable changes to this project will be documented in this file.
2031
- Add validation checking if template is selected on slide before save
2132
- [#260](https://github.com/os2display/display-admin-client/pull/260)
2233
- Bug in multiselect, fixed by removing duplicates by key both `@id`and `id`
23-
- [#265](https://github.com/os2display/display-admin-client/pull/265)
24-
- Bug in multiselect, fixed by removing duplicates by key both `@id`and `id`
2534
- [#259](https://github.com/os2display/display-admin-client/pull/259)
2635
- Add saving of playlists/groups with screen (as opposed to _after_)
2736
- Clean up `screen-manager.jsx`

0 commit comments

Comments
 (0)