Commit Graph

3990 Commits

Author SHA1 Message Date
Alex Unger
10a55d78ee Merge pull request #794 from owncloud/ocis-715 2020-11-03 21:00:41 +01:00
A.Unger
35161f7833 Merge branch 'master' into ocis-715 2020-11-03 20:15:26 +01:00
A.Unger
a4a69b714b add a changelog 2020-11-03 16:13:39 +01:00
A.Unger
f17b153557 update test reflect hardcoded values 2020-11-03 16:10:05 +01:00
A.Unger
81b5615b6b the address of a variable cannot be nil... 2020-11-03 15:57:54 +01:00
A.Unger
430f4852e2 add replace on github.com/owncloud/ocis/storage 2020-11-03 15:36:30 +01:00
A.Unger
1168bdbb5d add recover branch 2020-11-03 15:33:41 +01:00
A.Unger
11dee33e3c update github.com/mennanov/fieldmask-utils@v0.3.3
slim down cofig
2020-11-03 15:33:27 +01:00
Phil Davis
1478724a6d Merge pull request #792 from owncloud/bump-core-commit-id-20201103
[tests-only] Bump core commit for API tests
2020-11-03 16:45:32 +05:45
Phil Davis
7aaa76e847 Adjust expected-failures for core PR 38071 2020-11-03 16:01:17 +05:45
Phil Davis
681d0bc209 Bump core commit id to include core PR 38071 2020-11-03 15:32:09 +05:45
Phil Davis
edcb44ba15 Adjust line numbers in expected-failures 2020-11-03 15:23:55 +05:45
Phil Davis
4eedb928e9 Bump core commit for API tests 2020-11-03 13:53:51 +05:45
Lukas Hirt
9791a8d28f Merge pull request #791 from owncloud/regenerate-assets
Regenerate assets
2020-11-02 21:00:50 +01:00
Simon Eisenmann
e4279e910b Automated changelog update [skip ci] 2020-11-02 15:22:48 +00:00
Ilja Neumann
2599640f35 regenerate assets 2020-11-02 16:13:17 +01:00
Simon Eisenmann
f063d2f9a3 Fix processing for prompt select_account with consent
Multiple prompt values are allowed and this change fixes the check for
select_account if it was used together with other prompt values. Where
select_account previously was ignored, it is now processed as required,
fixing the use case when a RP wants to trigger select_account first
while at the same time wants also to request interactive consent.
2020-11-02 15:38:59 +01:00
Jörn Friedrich Dreyer
3cab05aa88 Merge pull request #767 from owncloud/ocis-697
Support OData for search queries on the Indexer
2020-11-02 14:30:24 +01:00
A.Unger
d378f072c2 Merge branch 'master' into ocis-697 2020-11-02 12:24:06 +01:00
Phil Davis
e13b2efa42 Merge pull request #787 from owncloud/php-dependencies-for-composer-2.0
[tests-only] Adjust PHP dependencies for composer 2.0
2020-11-02 17:04:36 +05:45
Phil Davis
c7071e72da Adjust PHP dependencies for composer 2.0 2020-11-02 16:19:37 +05:45
Phil Davis
37c711380c Merge pull request #784 from owncloud/expectedFailuresreShareAsPublicLinkToShares
[tests-only] adjust expected failures list after owncloud/core/pull/38056
2020-10-31 10:02:31 +05:45
Phil Davis
afcc0fdfea Adjust apiWebdavPreviews/previews.feature line numbers 2020-10-31 08:53:46 +05:45
Artur Neumann
07cc1c7e70 bump core commit id 2020-10-31 08:47:15 +05:45
Artur Neumann
aee21e096f adjust expected failures list after owncloud/core/pull/38056 2020-10-31 08:47:15 +05:45
Michael Barz
9b1f35f984 Automated changelog update [skip ci] 2020-10-30 16:26:22 +00:00
Michael Barz
dac5410fcc Merge pull request #779 from butonic/introduce-docker-compose-eos-test
introduce docker-compose eos setup
2020-10-30 16:44:20 +01:00
Michael Barz
657ba76e78 Merge pull request #786 from owncloud/update-glauth
update glauth to 4f029234b2308
2020-10-30 16:41:18 +01:00
Benedikt Kulmann
bb65534cd6 Automated changelog update [skip ci] 2020-10-30 15:07:52 +00:00
Benedikt Kulmann
ba79843497 Merge pull request #785 from owncloud/update-phoenix-0.23.0
Update phoenix to 0.23.0
2020-10-30 15:26:07 +01:00
Michael Barz
10e2a289ab update glauth to 4f029234b2308 2020-10-30 15:24:53 +01:00
Michael Barz
a20b882965 update glauth to 4f029234b2308 2020-10-30 14:33:57 +01:00
Benedikt Kulmann
13c6416c13 Update phoenix to 0.23.0 2020-10-30 14:16:18 +01:00
Michael Barz
72491b4dcc Merge pull request #770 from owncloud/document-version-cmd
[Docs-only] add version command to docs
2020-10-30 09:47:27 +01:00
Alex Unger
07be4c92d5 Merge branch 'master' into ocis-697 2020-10-29 17:50:29 +01:00
Alex Unger
6761f70959 try non unique? 2020-10-29 16:09:20 +01:00
Alex Unger
636caea217 add index on account.Id due to a rogue query 2020-10-29 15:24:26 +01:00
Phil Davis
d34b5dcf92 Merge pull request #778 from owncloud/expectedFailuresTestsFavorites
[tests-only] expected failures of favourites tests
2020-10-29 17:27:41 +05:45
Artur Neumann
698328b140 expected failures of favorites tests 2020-10-29 16:24:23 +05:45
Jörn Friedrich Dreyer
6db6b22aaf introduce docker-compose eos setup
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-10-29 11:23:30 +01:00
Artur Neumann
6b75bb1f2d Merge pull request #753 from owncloud/bump-core-commit-20201026
[tests-only] Bump core commit for tests
2020-10-29 13:47:49 +05:45
Phil Davis
b0e009d1b3 Bump core commit again as at 20201029 2020-10-29 13:00:08 +05:45
Artur Neumann
afd9bc2281 Bump core commit for tests 20201028 2020-10-29 13:00:08 +05:45
Phil Davis
819681e76d Bump core commit for tests 2020-10-29 13:00:08 +05:45
David Christofas
788b18f3a7 [Docs-only] add version command to docs
Signed-off-by: David Christofas <dchristofas@owncloud.com>
2020-10-28 17:43:46 +01:00
A.Unger
c72e212c91 first implementation of our own query tree and tree resolution
added godata dep

use correct godata dependency, enhance tests

refactor around indexer search tree

tests reflecting currently used queries

fix static checker

fix linter

replace old regexp with a calll to indexer.Query

fix linter

remove offenses
2020-10-28 16:02:44 +01:00
Michael Barz
e686c6786b fix release Changelog destination 2020-10-28 09:56:22 +01:00
Michael Barz
573351b0d7 fix release Changelog 2020-10-28 09:18:53 +01:00
Benedikt Kulmann
92ae96600d Automated changelog update [skip ci] 2020-10-27 06:46:44 +00:00
Benedikt Kulmann
7948040317 Merge pull request #757 from owncloud/update-ocis-phoenix-0.22.0
Prepare release for phoenix 0.22.0
2020-10-27 07:01:57 +01:00