Skip to content

Commit

Permalink
Merge pull request #160 from nextcloud/release/2.6.0-dev.0
Browse files Browse the repository at this point in the history
2.6.0-dev.0
  • Loading branch information
ArtificialOwl authored Sep 16, 2024
2 parents 307a9b8 + 9ac5993 commit bbeb9be
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0', '8.1', '8.2']
php-versions: ['8.1', '8.2']
server-versions: ['master']

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-oci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.1']
server-versions: ['master']

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.1']
server-versions: ['master']

services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0']
php-versions: ['8.1']
server-versions: ['master']

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.0']
php-versions: ['8.1']
databases: ['sqlite']
server-versions: ['master']

Expand Down
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,56 @@
# Changelog
All notable changes to this project will be documented in this file.

## 2.5.2

- get rid of getEventDispatcher()
- compat nc30

## 2.5.1

- ignore null user on logout
- compat nc29

## 2.5.0

- compat nc28

## 2.4.5

- fix an issue in auth process on slave

## 2.4.4

- fix a path lost during the redirection of a not logged account to master

## 2.4.3

- sanitize uid while getting its location
- encode uid on search on LUS
- wrap JWT with mozart

## 2.4.2

- add a settings to stay on slave if local account after logout
- check instance type before updating user

## 2.4.1

- passing idp to slave, back to master on logout.
- storing idp in user preferences.

## 2.4.0

- compat nc26

## 2.3.2

- new app type extended_authentication

## 2.3.1

- get full account data on login

## 2.3.0

- new session is now generated on slave when using user_saml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build_dir=$(CURDIR)/build/artifacts
source_dir=$(build_dir)/source
sign_dir=$(build_dir)/sign
package_name=$(app_name)
version+=2.3.1
version+=2.6.0-dev.0

all: appstore

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<name>Global Site Selector</name>
<summary>Nextcloud Portal to redirect users to the right instance</summary>
<description>The Global Site Selector allows you to run multiple small Nextcloud instances and redirect users to the right server</description>
<version>2.5.0-beta1</version>
<version>2.6.0-dev.0</version>
<licence>agpl</licence>
<author>Bjoern Schiessle</author>
<author>Maxence Lange</author>
Expand All @@ -17,7 +17,7 @@
<bugs>https://github.com/nextcloud/globalsiteselector/issues</bugs>
<repository>https://github.com/nextcloud/globalsiteselector</repository>
<dependencies>
<nextcloud min-version="28" max-version="28"/>
<nextcloud min-version="28" max-version="31"/>
</dependencies>
<background-jobs>
<job>OCA\GlobalSiteSelector\BackgroundJobs\UpdateLookupServer</job>
Expand Down

0 comments on commit bbeb9be

Please sign in to comment.