Skip to content

Commit 193ef52

Browse files
artongeartonge
authored
Merge branch 'master' into artonge/fix/update_display_name
2 parents 8688d3d + cfe2480 commit 193ef52

34 files changed

Lines changed: 657 additions & 191 deletions

‎.github/workflows/integration.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
php-versions: [ "8.2", "8.3", "8.4", "8.5" ]
44+
php-versions: ["8.3", "8.4", "8.5" ]
4545
databases: [ "mysql" ]
4646
server-versions: [ "master" ]
4747
include:
4848
- server-versions: "stable32"
49-
php-versions: "8.3"
49+
php-versions: "8.2"
5050
databases: "sqlite"
5151
- server-versions: "stable32"
5252
php-versions: "8.3"

‎appinfo/info.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ While theoretically any other authentication provider implementing either one of
5757
<command>OCA\User_SAML\Command\ConfigDelete</command>
5858
<command>OCA\User_SAML\Command\ConfigGet</command>
5959
<command>OCA\User_SAML\Command\ConfigSet</command>
60+
<command>OCA\User_SAML\Command\ConfigValidate</command>
6061
<command>OCA\User_SAML\Command\GetMetadata</command>
6162
<command>OCA\User_SAML\Command\GroupMigrationCopyIncomplete</command>
6263
<command>OCA\User_SAML\Command\GroupMigrationManual</command>

‎composer.lock‎

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l10n/de.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l10n/de.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ "translations": {
22
"This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte die Administration kontaktieren.",
33
"Authentication failed." : "Authentifizierung fehlgeschlagen.",
4+
"SAML authentication is not configured. Please ask your administrator to complete the SAML setup in the admin panel." : "SAML-Authentifizierung ist nicht eingerichtet. Bitte an die Administration wenden, um die SAML-Einrichtung im Administrationsbereich vornehmen zu lassen.",
45
"Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte die Log-Datei für weitere Informationen prüfen.",
56
"Direct log in" : "Direkte Anmeldung",
67
"SSO & SAML log in" : "SSO- & SAML-Anmeldung",

‎l10n/de_DE.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎l10n/de_DE.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{ "translations": {
22
"This user account is disabled, please contact your administrator." : "Dieses Nutzerkonto ist deaktiviert. Bitte kontaktieren Sie Ihre Administration.",
33
"Authentication failed." : "Authentifizierung fehlgeschlagen.",
4+
"SAML authentication is not configured. Please ask your administrator to complete the SAML setup in the admin panel." : "SAML-Authentifizierung ist nicht eingerichtet. Bitte an die Administration wenden, um die SAML-Einrichtung im Administrationsbereich vornehmen zu lassen.",
45
"Unknown error, please check the log file for more details." : "Unbekannter Fehler, bitte prüfen Sie die Log-Datei für weitere Informationen.",
56
"Direct log in" : "Direkte Anmeldung",
67
"SSO & SAML log in" : "SSO- & SAML-Anmeldung",

‎l10n/et_EE.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,25 @@ OC.L10N.register(
33
{
44
"This user account is disabled, please contact your administrator." : "See kasutajakonto on blokeeritud. Palun võta ühendust oma peakasutajaga.",
55
"Authentication failed." : "Autentimine ei õnnestunud.",
6+
"SAML authentication is not configured. Please ask your administrator to complete the SAML setup in the admin panel." : "SAML-i põhine autentimine pole seadistatud. Palu oma serveri haldajal või peakasutajal vajalik seadistus lõpetada.",
67
"Unknown error, please check the log file for more details." : "Tundmatu viga, täpsemat teavet leiad logidest.",
8+
"Direct log in" : "Otsene sisselogimine",
9+
"This page should not be visited directly." : "Seda lehte ei peaks otse vaatama.",
710
"Provider %s" : "Teenusepakkuja %s",
811
"X.509 certificate of the Service Provider" : "Teenusepakkuja X.509 sertifikaat",
912
"Private key of the Service Provider" : "Teenusepakkuja privaatvõti",
1013
"Whether the metadata should be signed." : "Kas metaandmed peaks olema allkirjastatud.",
14+
"Algorithm that the toolkit will use on signing process." : "Algoritm, mida tööriistakomplekt allkirjastamisprotsessis kasutab.",
1115
"Use POST method for SAML request (default: GET)" : "Kasuta SAML-i päringute jaoks POST-meetodit (vaikimisi on kasutusel GET-meetod)",
1216
"Group A, Group B, …" : "Grupp A, grupp B, …",
1317
"Require membership in these groups, if any." : "Eelda nende gruppide liikmelisust, kui seda vaja peaks olema.",
1418
"Email address" : "E-posti aadress",
1519
"Encrypted" : "Krüptitud",
20+
"Kerberos" : "Kerberos",
21+
"Persistent" : "Püsiv",
22+
"Transient" : "Ajutine",
1623
"Unspecified" : "Määratlemata",
24+
"Windows domain qualified name" : "Windowsi domeeni nimi",
1725
"SSO & SAML authentication" : "SSO & SAML autentimine",
1826
"Provider {id}" : "Teenusepakkuja {id}",
1927
"Could not create provider configuration" : "Teenusepakkuja seadistuste loomine ei õnnestunud",
@@ -31,6 +39,7 @@ OC.L10N.register(
3139
"Register new provider" : "Registreeri uus teenusepakkuja",
3240
"Remove {name}" : "Eemalda fail: „{name}“",
3341
"Reset settings" : "Lähtesta seadistused",
42+
"Environment var starting with HTTP_ are not allowed as HTTP headers are saved in these environment variables" : "HTTP_-ga algavaid keskkonnamuutujaid ei ole lubatud kasutada, kuna nendesse keskkonnamuutujatesse salvestatakse HTTP-päisekirjed",
3443
"Configure: {name}" : "Seadista: {name}",
3544
"Cancel changes" : "Tühista muudatused",
3645
"Download metadata XML" : "Laadi alla metateabe XML",
@@ -39,7 +48,7 @@ OC.L10N.register(
3948
"General" : "Üldine",
4049
"Service Provider Data" : "Teenusepakkuja andmed",
4150
"Attribute mapping" : "Atribuutide vastendamine",
42-
"Security settings" : "Turvaseaded",
51+
"Security settings" : "Turvaseadistused",
4352
"Signatures and encryption offered" : "Allkirjastamine ja krüptimine on saadaval",
4453
"Signatures and encryption required" : "Allkirjastamine ja krüptimine on nõutavad",
4554
"User filtering" : "Kasutajate filtreerimine",

‎l10n/et_EE.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
{ "translations": {
22
"This user account is disabled, please contact your administrator." : "See kasutajakonto on blokeeritud. Palun võta ühendust oma peakasutajaga.",
33
"Authentication failed." : "Autentimine ei õnnestunud.",
4+
"SAML authentication is not configured. Please ask your administrator to complete the SAML setup in the admin panel." : "SAML-i põhine autentimine pole seadistatud. Palu oma serveri haldajal või peakasutajal vajalik seadistus lõpetada.",
45
"Unknown error, please check the log file for more details." : "Tundmatu viga, täpsemat teavet leiad logidest.",
6+
"Direct log in" : "Otsene sisselogimine",
7+
"This page should not be visited directly." : "Seda lehte ei peaks otse vaatama.",
58
"Provider %s" : "Teenusepakkuja %s",
69
"X.509 certificate of the Service Provider" : "Teenusepakkuja X.509 sertifikaat",
710
"Private key of the Service Provider" : "Teenusepakkuja privaatvõti",
811
"Whether the metadata should be signed." : "Kas metaandmed peaks olema allkirjastatud.",
12+
"Algorithm that the toolkit will use on signing process." : "Algoritm, mida tööriistakomplekt allkirjastamisprotsessis kasutab.",
913
"Use POST method for SAML request (default: GET)" : "Kasuta SAML-i päringute jaoks POST-meetodit (vaikimisi on kasutusel GET-meetod)",
1014
"Group A, Group B, …" : "Grupp A, grupp B, …",
1115
"Require membership in these groups, if any." : "Eelda nende gruppide liikmelisust, kui seda vaja peaks olema.",
1216
"Email address" : "E-posti aadress",
1317
"Encrypted" : "Krüptitud",
18+
"Kerberos" : "Kerberos",
19+
"Persistent" : "Püsiv",
20+
"Transient" : "Ajutine",
1421
"Unspecified" : "Määratlemata",
22+
"Windows domain qualified name" : "Windowsi domeeni nimi",
1523
"SSO & SAML authentication" : "SSO & SAML autentimine",
1624
"Provider {id}" : "Teenusepakkuja {id}",
1725
"Could not create provider configuration" : "Teenusepakkuja seadistuste loomine ei õnnestunud",
@@ -29,6 +37,7 @@
2937
"Register new provider" : "Registreeri uus teenusepakkuja",
3038
"Remove {name}" : "Eemalda fail: „{name}“",
3139
"Reset settings" : "Lähtesta seadistused",
40+
"Environment var starting with HTTP_ are not allowed as HTTP headers are saved in these environment variables" : "HTTP_-ga algavaid keskkonnamuutujaid ei ole lubatud kasutada, kuna nendesse keskkonnamuutujatesse salvestatakse HTTP-päisekirjed",
3241
"Configure: {name}" : "Seadista: {name}",
3342
"Cancel changes" : "Tühista muudatused",
3443
"Download metadata XML" : "Laadi alla metateabe XML",
@@ -37,7 +46,7 @@
3746
"General" : "Üldine",
3847
"Service Provider Data" : "Teenusepakkuja andmed",
3948
"Attribute mapping" : "Atribuutide vastendamine",
40-
"Security settings" : "Turvaseaded",
49+
"Security settings" : "Turvaseadistused",
4150
"Signatures and encryption offered" : "Allkirjastamine ja krüptimine on saadaval",
4251
"Signatures and encryption required" : "Allkirjastamine ja krüptimine on nõutavad",
4352
"User filtering" : "Kasutajate filtreerimine",

0 commit comments

Comments
 (0)