mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-05 15:57:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,935 Commits 52 Branches 48 Tags
cfb6bf3ffc8da6450a544607ee99b4e9b9acdcf1
Commit Graph

4935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Willy Kloucek
cfb6bf3ffc Merge branch 'master' into master 2021-01-29 17:42:01 +01:00
Benedikt Kulmann
b3062d1bd9 Merge pull request #1566 from owncloud/rename-cmd-to-idp 
Rename konnectd to idp
 2021-01-29 16:46:26 +01:00
Ilja Neumann
085f6f0f4a Rename konnectd to idp 2021-01-29 20:39:41 +05:45
Phil Davis
92fbc158aa Merge pull request #1393 from owncloud/add_release_info 
[docs-only] add release roadmap
 2021-01-29 20:31:44 +05:45
Phil Davis
975737d5e6 Merge branch 'master' into add_release_info 2021-01-29 20:30:03 +05:45
Phil Davis
e1394172db Merge pull request #1174 from owncloud/keycloak_oC_client_config 
[docs-only] fix Keycloak deployment example
 2021-01-29 20:28:53 +05:45
Willy Kloucek
5265ec4a06 Merge branch 'master' into add_release_info 2021-01-29 14:57:07 +01:00
Willy Kloucek
18a05e5fbc fix typo 2021-01-29 14:45:00 +01:00
Willy Kloucek
282a1c81c4 Merge branch 'master' into master 2021-01-29 14:32:13 +01:00
Phil Davis
d60604366c Adjust expected-failures for differences between cs3org/reva and OCIS 2021-01-29 15:21:31 +02:00
Phil Davis
4855f6b6a4 Copy categorized expected-failures files from cs3org/reva 2021-01-29 15:21:31 +02:00
Ilja Neumann
6d8f551b02 Rename konnectd to idp 2021-01-29 15:21:31 +02:00
Ilja Neumann
304b8a9846 Fix IDP title 2021-01-29 15:21:31 +02:00
Ilja Neumann
7732949e3c Rename konnectd to IDP 2021-01-29 15:21:31 +02:00
Willy Kloucek
9186448344 fix config links 2021-01-29 15:21:31 +02:00
Jörn Friedrich Dreyer
94299861c1 Automated changelog update [skip ci] 2021-01-29 15:21:31 +02:00
Ishank Arora
823e99efa9 Check if roles are present in user object before looking those up 2021-01-29 15:21:31 +02:00
Erwin Palma
fb2fe1dd19 Update CONFIGURATION.tmpl 
The following link does no exist

[our repository](https://github.com/owncloud/ocis/tree/master/config),
 2021-01-29 15:21:31 +02:00
Willy Kloucek
2e09c80855 Merge branch 'master' into keycloak_oC_client_config 2021-01-29 14:05:04 +01:00
Phil Davis
34d53304df Merge pull request #1548 from owncloud/categorize-expected-failures 
[tests-only] Categorize expected-failures files
 2021-01-29 18:42:08 +05:45
Phil Davis
2f73400328 Adjust expected-failures for differences between cs3org/reva and OCIS 2021-01-29 17:38:39 +05:45
Phil Davis
9ae6704d60 Copy categorized expected-failures files from cs3org/reva 2021-01-29 17:38:39 +05:45
Ilja Neumann
4aea7a997d Rename konnectd to idp 2021-01-29 12:31:16 +01:00
Ilja Neumann
9751387b1b Fix IDP title 2021-01-29 12:31:16 +01:00
Ilja Neumann
03cadf304c Rename konnectd to IDP 2021-01-29 12:31:16 +01:00
Ingmar Aasoja
aca22cab42 Add changelog 2021-01-29 13:01:55 +02:00
Willy Kloucek
a93caad947 Merge branch 'master' into add_release_info 2021-01-29 11:59:04 +01:00
Willy Kloucek
a378f259eb Merge pull request #1545 from owncloud/erwinpalma-patch-1 
[docs-only] Update CONFIGURATION.tmpl
 2021-01-29 11:17:35 +01:00
Willy Kloucek
ffdc10cebe Merge branch 'master' into erwinpalma-patch-1 2021-01-29 11:14:37 +01:00
Willy Kloucek
29129cdb9d fix config links 2021-01-29 11:14:03 +01:00
Ingmar Aasoja
f9954bb022 Remove duplicated code and use existant getRegistry() instead 2021-01-29 11:54:44 +02:00
Willy Kloucek
080d348d19 automatic realm import on startup 2021-01-29 10:49:33 +01:00
Willy Kloucek
5a74c1f49f add import and export 2021-01-29 10:49:33 +01:00
Willy Kloucek
aaac06da5b let keycloak serve the well-known/openidconnect 2021-01-29 10:49:33 +01:00
Willy Kloucek
8ed2dedf4c fix ocis-net 2021-01-29 10:49:33 +01:00
Willy Kloucek
b5d586fd89 add clients 2021-01-29 10:49:33 +01:00
Jörn Friedrich Dreyer
414b635433 Automated changelog update [skip ci] 2021-01-29 09:46:37 +00:00
Jörn Friedrich Dreyer
1b9126ad48 Merge pull request #1388 from ishank011/roles-fix 
Check if roles are present in user object before looking those up
 2021-01-29 10:44:36 +01:00
Ishank Arora
30c80b0923 Check if roles are present in user object before looking those up 2021-01-28 17:25:59 +01:00
Ingmar Aasoja
5c235be89b Use MICRO_REGISTRY_ADDRESS env var for etcd address 2021-01-28 16:12:08 +02:00
Erwin Palma
18426be9a2 Update CONFIGURATION.tmpl 
The following link does no exist

[our repository](https://github.com/owncloud/ocis/tree/master/config),
 2021-01-28 15:05:01 +01:00
Artur Neumann
4fa73662ed Merge pull request #1535 from owncloud/bump-commit-id-20210126 
[tests-only] Bump commit ids for tests
 2021-01-28 14:11:56 +05:45
Phil Davis
6f27c726ce Adjust expected-failures 2021-01-28 13:13:47 +05:45
Phil Davis
5751b08266 Bump commit ids for tests 2021-01-28 13:08:36 +05:45
Phil Davis
235a79ff12 Merge pull request #1543 from owncloud/restore-tests 
[tests-only] Restore test files removed in PR #1488
 2021-01-28 12:54:16 +05:45
Phil Davis
dfb4eb11cb Rename apiOcisSpecific to apiBugDemonstration 2021-01-28 12:03:01 +05:45
Phil Davis
924246c0a6 Rename apiBasic to apiAccountsHashDifficulty 2021-01-28 11:56:07 +05:45
saw-jan
5a44f83bbf restore test files removed in PR #1488 2021-01-28 11:40:12 +05:45
Phil Davis
5dac7ae5c4 Automated changelog update [skip ci] 2021-01-28 05:52:15 +00:00
Phil Davis
54c4a73c8e Merge pull request #1540 from owncloud/bump-gherkin-4.7.1 
[tests-only] Bump behat/gherkin to 4.7.1
 2021-01-28 11:36:23 +05:45