2f2938173a
[MISC] (deps): Bump @fortawesome/fontawesome-svg-core in /web ( #1202 )
...
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome ) from 1.2.29 to 1.2.30.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-16 12:32:31 +10:00
045771161e
[MISC] (deps): Bump golang in /internal/suites/example/compose/authelia ( #1201 )
...
Bumps golang from 1.14.4-alpine to 1.14.5-alpine.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Clément Michaud <clement.michaud34@gmail.com>
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
2020-07-16 11:56:11 +10:00
145a83ee0d
[MISC] (deps): Bump just-the-docs from 0.3.0 to 0.3.1 in /docs ( #1205 )
...
Bumps [just-the-docs](https://github.com/pmarsceill/just-the-docs ) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/pmarsceill/just-the-docs/releases )
- [Commits](https://github.com/pmarsceill/just-the-docs/compare/v0.3.0...v0.3.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-16 00:11:53 +02:00
e5d02d4b06
[MISC] (deps): Bump github.com/valyala/fasthttp from 1.14.0 to 1.15.1 ( #1200 )
...
Bumps [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp ) from 1.14.0 to 1.15.1.
- [Release notes](https://github.com/valyala/fasthttp/releases )
- [Commits](https://github.com/valyala/fasthttp/compare/v1.14.0...v1.15.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-15 23:32:54 +02:00
c5c41c6111
[MISC] (deps): Bump github.com/go-ldap/ldap/v3 from 3.2.1 to 3.2.2 ( #1199 )
...
Bumps [github.com/go-ldap/ldap/v3](https://github.com/go-ldap/ldap ) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/go-ldap/ldap/releases )
- [Commits](https://github.com/go-ldap/ldap/compare/v3.2.1...v3.2.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-15 11:01:35 +10:00
e694ee7194
[MISC] (deps): Bump @types/node from 14.0.22 to 14.0.23 in /web ( #1197 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.22 to 14.0.23.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-14 18:38:57 +10:00
c9958d93b2
[MISC] (deps): Bump @types/react from 16.9.41 to 16.9.43 in /web ( #1194 )
...
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react ) from 16.9.41 to 16.9.43.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-13 18:45:16 +10:00
3c93515535
[MISC] (deps): Bump @types/node from 14.0.20 to 14.0.22 in /web ( #1192 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.20 to 14.0.22.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-13 15:10:35 +10:00
fea58c52e0
[MISC] (deps): Bump haproxy in /internal/suites/example/compose/haproxy ( #1190 )
...
Bumps haproxy from 2.1-alpine to 2.2.0-alpine.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-13 14:21:45 +10:00
341b058b25
[MISC] (deps): Bump @types/node from 14.0.19 to 14.0.20 in /web ( #1187 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.19 to 14.0.20.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-09 08:48:49 +02:00
c936e6e1fa
[MISC] (deps): Bump @types/node from 14.0.18 to 14.0.19 in /web ( #1185 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.18 to 14.0.19.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-08 11:55:51 +10:00
5ba2a8c42d
[MISC] (deps): Bump react-ga from 3.1.1 to 3.1.2 in /web ( #1184 )
...
Bumps [react-ga](https://github.com/react-ga/react-ga ) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/react-ga/react-ga/releases )
- [Commits](https://github.com/react-ga/react-ga/compare/v3.1.1...v3.1.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-07 14:49:24 +10:00
86d77bfcd0
[MISC] (deps): Bump @types/node from 14.0.14 to 14.0.18 in /web ( #1183 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.14 to 14.0.18.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-07 13:52:41 +10:00
183179288e
[MISC] (deps): Bump @types/jest from 26.0.3 to 26.0.4 in /web ( #1182 )
...
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest ) from 26.0.3 to 26.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
2020-07-07 11:41:48 +10:00
dc9e6d619d
[MISC] (deps): Bump react-otp-input from 1.0.1 to 2.0.0 in /web ( #1181 )
...
Bumps [react-otp-input](https://github.com/devfolioco/react-otp-input ) from 1.0.1 to 2.0.0.
- [Release notes](https://github.com/devfolioco/react-otp-input/releases )
- [Commits](https://github.com/devfolioco/react-otp-input/commits/v2.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-07 10:13:10 +10:00
33e1936c29
[MISC] (deps): Bump react-ga from 3.0.0 to 3.1.1 in /web ( #1177 )
...
Bumps [react-ga](https://github.com/react-ga/react-ga ) from 3.0.0 to 3.1.1.
- [Release notes](https://github.com/react-ga/react-ga/releases )
- [Commits](https://github.com/react-ga/react-ga/compare/v3.0.0...v3.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-04 19:39:54 +10:00
0df8f6bfe3
[CI] Collect and upload coverage on master branch ( #1174 )
2020-07-02 08:56:45 +02:00
db5924ac53
[MISC] (deps): Bump typescript from 3.9.5 to 3.9.6 in /web ( #1173 )
...
Bumps [typescript](https://github.com/Microsoft/TypeScript ) from 3.9.5 to 3.9.6.
- [Release notes](https://github.com/Microsoft/TypeScript/releases )
- [Commits](https://github.com/Microsoft/TypeScript/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-02 09:35:56 +10:00
cd2e7eb4bf
[RELEASE] v4.21.0 ( #1172 )
2020-07-01 17:39:42 +10:00
160e98f275
[DEV] Fix webpack for development workflow ( #1163 )
2020-07-01 17:16:08 +10:00
ccc5ce8b42
[CI] Final touches to PR commentary ( #1171 )
2020-07-01 16:59:46 +10:00
73a7d0465a
[CI] Attempt to fix PR commentary ( #1168 )
2020-07-01 16:28:12 +10:00
414927043c
[CI] Ignore CI/CD and notify for forked master branches ( #1166 )
...
There is an issue with codecov where if a PR is made from a forked master branch this manages to assume itself as the default codecov branches, this in turn causes coverage synchronisation issues for our repo.
2020-07-01 16:07:27 +10:00
07223170d4
[MISC] (deps): Bump @material-ui/core from 4.10.2 to 4.11.0 in /web ( #1164 )
...
Bumps [@material-ui/core](https://github.com/mui-org/material-ui/tree/HEAD/packages/material-ui ) from 4.10.2 to 4.11.0.
- [Release notes](https://github.com/mui-org/material-ui/releases )
- [Changelog](https://github.com/mui-org/material-ui/blob/v4.11.0/CHANGELOG.md )
- [Commits](https://github.com/mui-org/material-ui/commits/v4.11.0/packages/material-ui )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-07-01 10:59:27 +10:00
c5916cbce6
[DOCS] Adjust Deployment navigation order ( #1160 )
2020-06-29 16:55:41 +10:00
697ffd8d73
[DOCS] Fix just-the-docs theme styling ( #1159 )
...
This fixes a minor regression due to #1158 .
As there was significant styling changes and due to our introduction of the github fork ribbon for the docs the layout also needed to be updated.
2020-06-29 11:20:38 +10:00
997e17cdc6
[MISC] (deps): Bump just-the-docs from 0.2.9 to 0.3.0 in /docs ( #1158 )
...
Bumps [just-the-docs](https://github.com/pmarsceill/just-the-docs ) from 0.2.9 to 0.3.0.
- [Release notes](https://github.com/pmarsceill/just-the-docs/releases )
- [Commits](https://github.com/pmarsceill/just-the-docs/compare/v0.2.9...v0.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-29 09:42:14 +10:00
5c4edf2f4d
[FEATURE] Support for subject combinations in ACLs ( #1142 )
2020-06-25 18:22:42 +10:00
b6a8b479fc
[MISC] (deps): Bump @types/node from 14.0.13 to 14.0.14 in /web ( #1155 )
...
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node ) from 14.0.13 to 14.0.14.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-25 10:24:24 +10:00
0d601619ef
[MISC] (deps): Bump @types/jest from 26.0.0 to 26.0.3 in /web ( #1154 )
...
Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest ) from 26.0.0 to 26.0.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
2020-06-25 10:07:38 +10:00
79524d0f7c
[MISC] (deps): Bump @types/react from 16.9.38 to 16.9.41 in /web ( #1153 )
...
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react ) from 16.9.38 to 16.9.41.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-25 09:47:55 +10:00
24ea88156b
[MISC] (deps): Bump github.com/go-ldap/ldap/v3 from 3.2.0 to 3.2.1 ( #1152 )
...
Bumps [github.com/go-ldap/ldap/v3](https://github.com/go-ldap/ldap ) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/go-ldap/ldap/releases )
- [Commits](https://github.com/go-ldap/ldap/compare/v3.2.0...v3.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-24 10:21:14 +10:00
b770d3cb6c
[BUGFIX] Fix paths for embedded media assets ( #1150 )
2020-06-24 09:37:49 +10:00
1a76241ad4
[MISC] (deps): Bump just-the-docs from 0.2.7 to 0.2.9 in /docs ( #1151 )
...
Bumps [just-the-docs](https://github.com/pmarsceill/just-the-docs ) from 0.2.7 to 0.2.9.
- [Release notes](https://github.com/pmarsceill/just-the-docs/releases )
- [Commits](https://github.com/pmarsceill/just-the-docs/compare/v0.2.7...v0.2.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-23 21:48:15 +02:00
29e54c231b
[MISC] Template global config and refactor some /api endpoints ( #1135 )
...
* [MISC] Template global config and refactor some /api endpoints
* /api/configuration has been removed in favour of templating said global config
* /api/configuration/extended has been renamed to /api/configuration and display_name has been removed
* /api/user/info has been modified to include display_name
Co-authored-by: Clement Michaud <clement.michaud34@gmail.com>
2020-06-21 15:40:37 +02:00
ddfce52939
[MISC] Strip debugging information from compiled binaries ( #1141 )
2020-06-21 21:52:35 +10:00
28f1a77f54
[DEV] Notify that macOS currently isn't supported for dev workflow ( #1140 )
2020-06-21 13:31:21 +02:00
8216eacfc4
[CI] Specify comparison target for codecov ( #1139 )
2020-06-21 13:36:00 +10:00
012e876a62
[MISC] (deps): Bump @fortawesome/free-solid-svg-icons in /web ( #1138 )
...
Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome ) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.13.0...5.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-21 13:02:47 +10:00
22a47b0765
[MISC] (deps): Bump @fortawesome/fontawesome-svg-core in /web ( #1137 )
...
Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome ) from 1.2.28 to 1.2.29.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-21 12:36:57 +10:00
af44228372
[MISC] (deps): Bump @fortawesome/free-regular-svg-icons in /web ( #1136 )
...
Bumps [@fortawesome/free-regular-svg-icons](https://github.com/FortAwesome/Font-Awesome ) from 5.13.0 to 5.13.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.13.0...5.13.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-21 12:18:25 +10:00
ea879dc83d
[DOCS] Add a section explaining why Authelia is open source ( #1134 )
...
* [DOCS] Add a section explaining why Authelia is open source.
* Apply suggestions from code review
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
* Move the Why Open Source? section.
2020-06-21 00:37:47 +10:00
6f96e4b119
[DOCS] Add FreeBSD Port as deployment option in README ( #1133 )
...
* [DOCS] Add FreeBSD Port as deployment option in README.
* Apply suggestions from code review
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
Co-authored-by: Amir Zarrinkafsh <nightah@me.com>
2020-06-21 00:22:15 +10:00
61883437cc
[DEV] Set chromedriver path with env variable ( #1123 )
2020-06-19 21:25:41 +10:00
e43bc93047
[FEATURE] Add configurable display name to frontend ( #1124 )
...
* [FEATURE] Add configurable display name to frontend
This feature allows users with a LDAP backend to specify an attribute (default is "displayname") to retrieve a users name for the portal greeting.
Similarly for the file based backend a new required key "name" has been introduced.
This can also be used down the line with OIDC as a separate scope.
* Update references from Name to DisplayName
* Update compose bundles to include displayname refs
* Update LDAP automatic profile refresh
* Ensure display name is updated
* Fix bug which prevented trace logging for profile refresh to not trigger
2020-06-19 20:50:21 +10:00
91376a5b3d
[BUGFIX] Re-add local compose configuration files ( #1131 )
...
This is also to address a regression from #1113 .
Fixes #1129 .
2020-06-19 12:30:13 +10:00
013f61ff4d
[BUGFIX] Fix local compose bundle regression from #1113 ( #1130 )
...
As files were moved to accommodate the new `/config` volume structure the `setup.sh` for the local compose bundle also requires updating to point to the new file locations.
Fixes #1129 .
2020-06-19 11:06:28 +10:00
0e206660ef
[MISC] (deps): Bump github.com/go-ldap/ldap/v3 from 3.1.11 to 3.2.0 ( #1128 )
...
Bumps [github.com/go-ldap/ldap/v3](https://github.com/go-ldap/ldap ) from 3.1.11 to 3.2.0.
- [Release notes](https://github.com/go-ldap/ldap/releases )
- [Commits](https://github.com/go-ldap/ldap/compare/v3.1.11...v3.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-19 08:57:16 +10:00
6ccc92e47e
do not hardcode /bin/bash ( #1122 )
...
Co-authored-by: Victor Büttner <victor@0x23.dk>
Co-authored-by: Clément Michaud <clement.michaud34@gmail.com>
2020-06-18 09:49:13 +02:00
9a4f3cf76b
[MISC] (deps): Bump @types/react from 16.9.36 to 16.9.38 in /web ( #1121 )
...
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react ) from 16.9.36 to 16.9.38.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases )
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2020-06-18 11:19:45 +10:00
dependabot-preview[bot]
Amir Zarrinkafsh
Philipp Staiger
Clément Michaud
vdot0x23