Commit Graph

4971 Commits

Author SHA1 Message Date
David Christofas
018f5dc32a lower the open pull request limit for dependabot 2021-02-02 11:16:59 +01:00
Phil Davis
2c793fb1d9 Merge pull request #1581 from owncloud/bump-commit-ids-20210201
[tests-only] Bump core and web commit ids for testing
2021-02-02 12:22:51 +05:45
Phil Davis
c059a2d41e Bump core and web commit ids for testing 2021-02-02 08:50:13 +05:45
Willy Kloucek
bb05da0bf1 Merge pull request #1568 from owncloud/bring_back_identifier-registration.yaml
bring back identifier-registration.yaml, strip commented stuff, rebuild embed.go
2021-02-01 17:04:48 +01:00
Willy Kloucek
686f496c31 bring back config file, strip commented stuff, fix makefile and rebuild 2021-02-01 14:33:55 +01:00
Phil Davis
35f7cd52b8 Merge pull request #1575 from owncloud/bump-commit-ids-20210130
[tests-only] Bump commit ids for tests
2021-02-01 18:39:54 +05:45
Phil Davis
01d5020b5a Adjust web expected-failures 2021-02-01 17:45:01 +05:45
Phil Davis
55b3464c49 Adjust API expected-failures 2021-02-01 17:45:01 +05:45
Phil Davis
10629889f2 Fix links in expected-failures 2021-02-01 17:45:01 +05:45
Phil Davis
5b8f5eb16d Bump web commit id for tests 2021-02-01 17:45:01 +05:45
Phil Davis
9bfc8693f2 Bump core commit id for tests 2021-02-01 17:45:01 +05:45
Jörn Friedrich Dreyer
10b5611167 Automated changelog update [skip ci] 2021-02-01 11:30:34 +00:00
Jörn Friedrich Dreyer
4ce67a48e7 Merge pull request #1374 from ishank011/upload-capabilities
Use a default protocol parameter instead of explicitly disabling tus
2021-02-01 12:29:24 +01:00
Willy Kloucek
17c4e9b1c5 Merge pull request #1489 from owncloud/continuous_deployment
continuous deployment
2021-02-01 10:56:03 +01:00
Willy Kloucek
f3404ab202 fix typo 2021-02-01 09:21:03 +01:00
Phil Davis
85ee5def6e Merge pull request #1574 from owncloud/remove_misplaced_changelog_item
[docs-only] remove misplaced changelog item
2021-01-30 14:28:00 +05:45
Jörn Friedrich Dreyer
45bb22863e Automated changelog update [skip ci] 2021-01-29 19:18:26 +00:00
Jörn Friedrich Dreyer
91b41586b8 Merge pull request #1186 from ishank011/home_mapping
Functionality to map home directory to different storage providers
2021-01-29 20:16:34 +01:00
Willy Kloucek
b7f02b0d1c Automated changelog update [skip ci] 2021-01-29 18:08:28 +00:00
Willy Kloucek
916746c719 remove misplaced changelog item 2021-01-29 19:06:09 +01:00
Willy Kloucek
eb72c5d96a Merge pull request #1546 from ybr-nx/master
Use MICRO_REGISTRY_ADDRESS env var for etcd address
2021-01-29 19:03:12 +01:00
Phil Davis
fb8a744dcb Merge pull request #1565 from owncloud/update-js-deps
Update JS dependencies
2021-01-29 23:42:36 +05:45
Willy Kloucek
6d78b361f8 Merge pull request #1567 from owncloud/disable_out-of-date-check
disable strict status check (set it to loose)
2021-01-29 17:42:28 +01:00
Willy Kloucek
cfb6bf3ffc Merge branch 'master' into master 2021-01-29 17:42:01 +01:00
Benedikt Kulmann
8cfbbf77b3 Update JS dependencies 2021-01-29 22:02:04 +05:45
Jörn Friedrich Dreyer
14aa851ae0 Merge branch 'master' into upload-capabilities 2021-01-29 17:04:59 +01:00
Jörn Friedrich Dreyer
a4480ed16e Merge branch 'master' into home_mapping 2021-01-29 17:04:51 +01:00
Willy Kloucek
e69e2213e4 Merge branch 'master' into disable_out-of-date-check 2021-01-29 16:46:40 +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
Willy Kloucek
ce9177e21c disable strict status check (set it to loose) 2021-01-29 16:30:29 +01:00
Willy Kloucek
1d5a116e3c add continuous deployments 2021-01-29 16:14:24 +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
Jörn Friedrich Dreyer
f90e49ad6a Merge branch 'master' into home_mapping 2021-01-29 14:39:14 +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