Commit Graph

3521 Commits

Author SHA1 Message Date
Lukas Hirt
98ebab14de Merge branch 'master' into update-ocis-phoenix-0.20.0 2020-10-09 13:00:17 +02:00
Artur Neumann
02f688a483 Merge pull request #676 from owncloud/add-drivers-flaex
[docs-only] Add Storage Driver Config to flaex
2020-10-09 16:11:48 +05:45
Lukas Hirt
cedcb907ea Update commit ID 2020-10-09 11:54:32 +02:00
Michael Barz
11ce9dccfc Add Storage Driver Config to flaex 2020-10-09 11:41:58 +02:00
Lukas Hirt
567c3d6822 Update phoenix 0.20.0 2020-10-09 11:14:26 +02:00
Phil Davis
84ca821fe4 Merge pull request #669 from owncloud/bump-core-test-commit-20201009
[Tests-Only] Bump core commit for tests 20201009
2020-10-09 14:02:24 +05:45
Phil Davis
680f2797d3 Bump core commit for tests 20201009 2020-10-09 12:05:27 +05:45
Artur Neumann
f2d560ff0f Merge pull request #666 from owncloud/fixDocs
[docs-only] Fix docs
2020-10-09 09:33:36 +05:45
Artur Neumann
e28fc863cc use proxy to run tests 2020-10-09 09:09:49 +05:45
Artur Neumann
9bf3bb726d use new default reva data folder 2020-10-09 09:09:49 +05:45
Phil Davis
674b58d37e Merge pull request #663 from owncloud/enable-sonarcloud
Enable sonarcloud scanning and coverage
2020-10-09 08:50:30 +05:45
Michael Barz
11fd4ed0c3 Enable sonarcloud scanning and coverage 2020-10-08 17:37:58 +02:00
Benedikt Kulmann
d46d69ed9f Merge pull request #507 from owncloud/admin-user-docs
[docs-only] Add credentials of the new admin user to docs
2020-10-08 16:45:26 +02:00
Benedikt Kulmann
569535cbed Add credentials of the new admin user to docs. 2020-10-08 16:42:34 +02:00
Michael Barz
3e1c3d367c Merge pull request #658 from owncloud/image_builder_rebased
Add Image builder
2020-10-08 15:05:06 +02:00
Michael Barz
1a077d93ec Automated changelog update [skip ci] 2020-10-08 11:29:58 +00:00
Michael Barz
f9e1b7be94 Merge pull request #649 from butonic/glauth-fallback-backend
add glauth fallback backend
2020-10-08 13:16:22 +02:00
Michael Barz
4b9215b854 Merge pull request #636 from owncloud/enable-ocs-group-tests
[Tests-only] Add ocs http tests for groups endpoints
2020-10-08 12:04:04 +02:00
Michael Barz
308610270d Update changelog/unreleased/glauth-fallback-option.md
Co-authored-by: Benedikt Kulmann <benedikt@kulmann.biz>
2020-10-08 11:43:54 +02:00
Jan Müller
4fafb96bbb Adds Dockerfile for building a local development image
Add image builder documentation

Fix list item indent

Fix codacy issues

Make alpine version explicit

Fix markup indents

Fix image tag

Remove list items from markdown
2020-10-08 11:41:20 +02:00
Benedikt Kulmann
e39b2ee645 Merge branch 'master' into glauth-fallback-backend 2020-10-08 10:30:56 +02:00
Phil Davis
621b411c7f Merge pull request #664 from owncloud/update-docker-compose
update the volumes in the docker-compose files
2020-10-08 13:12:29 +05:45
David Christofas
c29208a8fc update the volumes in the docker-compose files
Signed-off-by: David Christofas <dchristofas@owncloud.com>
2020-10-07 21:04:24 +02:00
Michael Barz
f544bc7eea Automated changelog update [skip ci] 2020-10-07 17:21:28 +00:00
Michael Barz
f63a76bfba Merge pull request #661 from owncloud/migrate-changelog
Migrate changelog
2020-10-07 19:06:05 +02:00
Michael Barz
4e78fc2d5b Remove ocis tags from changelog, correct urls 2020-10-07 16:33:01 +02:00
Michael Barz
6c9840f9df transfer all changelogs from the extensions to the root 2020-10-07 16:33:01 +02:00
Michael Barz
66df806e45 add glauth and tags 2020-10-07 16:33:01 +02:00
Phil Davis
03bbb41a66 Merge pull request #660 from owncloud/bump-commit-id-20201007
[Tests-Only] Bump core commit id for tests
2020-10-07 16:53:18 +05:45
Phil Davis
930b35bcd3 Bump core commit id for tests
and adjust expected-exceptions line numbers
2020-10-07 15:34:15 +05:45
Benedikt Kulmann
a62534796c Automated changelog update [skip ci] 2020-10-07 09:35:16 +00:00
Benedikt Kulmann
6ba385bcae Merge pull request #656 from owncloud/streamline-menus
Streamline menus
2020-10-07 11:20:19 +02:00
Benedikt Kulmann
42e51e443d Update phoenix to 0.19.0 2020-10-07 09:46:46 +02:00
Benedikt Kulmann
2f572ad50a Changelog for accounts warning 2020-10-07 09:46:45 +02:00
Benedikt Kulmann
a46c12738d Changelog for user menu 2020-10-07 09:46:45 +02:00
Benedikt Kulmann
e51f6d98e2 Show message in accounts UI about lack of permissions 2020-10-07 09:46:45 +02:00
Benedikt Kulmann
4a3c6bceed Change builtin default order of user menu apps 2020-10-07 09:46:45 +02:00
Benedikt Kulmann
b94dacf1dc Move settings navItem to user menu 2020-10-07 09:46:45 +02:00
Benedikt Kulmann
de1faa7c91 Move accounts navItem to user menu 2020-10-07 09:46:45 +02:00
Artur Neumann
e71f1d24aa Merge pull request #645 from owncloud/bump-core-commit-20201005
[Tests-Only] Bump core test commit id as at 20201006
2020-10-07 09:00:49 +05:45
Phil Davis
578de5a846 Adjust expected-failures 2020-10-06 22:00:53 +05:45
Artur Neumann
001e84b187 skip tests marked to be skipped on specific storages 2020-10-06 21:14:43 +05:45
Artur Neumann
0ccfb4bc7b expected failures in etag tests on OCIS storage 2020-10-06 21:14:43 +05:45
Phil Davis
cd6ebfb359 Bump core test commit id as at 20201006 2020-10-06 21:14:43 +05:45
Jörn Friedrich Dreyer
cbbfeec35b add glauth fallback backend
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-10-06 16:39:05 +02:00
Felix Böhm
f10950d6e8 Merge pull request #655 from owncloud/update-docs-rebased
[docs-only] Update docs
2020-10-06 15:20:43 +02:00
felixboehm
8bc206e45f revert phoenix rename 2020-10-06 15:18:50 +02:00
felixboehm
594f6bbc18 update pathes to monorepo. init development and depolyment section. 2020-10-06 15:03:14 +02:00
felixboehm
931a8b79bf revert phoenix rename 2020-10-06 14:46:22 +02:00
felixboehm
ae0f944cd0 fix docker build instruction 2020-10-06 14:46:22 +02:00