mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-05 19:59:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,922 Commits 50 Branches 39 Tags
686f496c315d7ffd334b731bfddbf000bad24145
Commit Graph

4922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Willy Kloucek
686f496c31 bring back config file, strip commented stuff, fix makefile and rebuild 2021-02-01 14:33:55 +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
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
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
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
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
Phil Davis
498a21cf0a [tests-only] Bump behat/gherkin to 4.7.1 2021-01-28 10:19:30 +05:45
Phil Davis
3c78241b98 Merge pull request #1539 from pascalwengerter/fix-ocis-github-cases 
[docs-only] Change (ocis,OCIS) to oCIS, unify GitHub branding
 2021-01-28 09:08:06 +05:45
Phil Davis
ae07429eea Apply suggestions from code review 2021-01-28 09:02:27 +05:45
Pascal Wengerter
d7b1ecb3dc Change (ocis,OCIS) to oCIS, unify GitHub branding 2021-01-28 00:32:47 +00:00
Willy Kloucek
5dd3612ae1 Merge branch 'master' into add_release_info 2021-01-27 09:00:03 +01:00
Phil Davis
8dd28582cc Merge pull request #1536 from owncloud/update-ocis-install-doc 
update docs to use latest ocis
 2021-01-27 08:18:15 +05:45
Florian Schade
157fbb6143 update docs to use latest ocis 2021-01-26 18:42:32 +01:00
Patrick Maier
c2bdf7878e Automated changelog update [skip ci] 2021-01-26 14:44:21 +00:00
Patrick Maier
a90cf56246 Update release_notes.md 2021-01-26 15:43:50 +01:00
Patrick Maier
e5c78eca3f 1.1.0 release notes 2021-01-26 15:43:50 +01:00
Benedikt Kulmann
5c3300b083 Move changelog to version specific folder 2021-01-26 15:43:50 +01:00
Artur Neumann
bec3290cb9 Merge pull request #1534 from owncloud/adjust-expected-failures-20210126 
[tests-only] Adjust some text in expected-failures to match cs3org/reva
 2021-01-26 19:06:18 +05:45
Phil Davis
4b53a1713b Adjust some text in expected-failures to match cs3org/reva 2021-01-26 18:05:21 +05:45