Commit Graph

310 Commits

Author SHA1 Message Date
A.Unger
eeb53b1ac0 avoid using local replaces 2020-05-28 13:49:24 +02:00
A.Unger
7a91b6261a remove leftover merge conflict line 2020-05-27 11:14:06 +02:00
A.Unger
c4466850ce Merge branch 'master' into feature/public-shares 2020-05-27 09:50:36 +02:00
Vincent Petry
1d1510d266 Automated changelog update [skip ci] 2020-05-26 16:20:47 +00:00
Vincent Petry
6a5d4b52dd Merge pull request #293 from owncloud/update-ocis-phoenix-0.7.0
Update ocis-phoenix to 0.7.0
2020-05-26 17:24:46 +02:00
Vincent Petry
563efc51bb Update ocis-phoenix to 0.7.0 2020-05-26 16:27:35 +02:00
A.Unger
d2b2a25beb Merge branch 'master' into feature/public-shares 2020-05-26 12:01:32 +02:00
A.Unger
c2ac68c147 update deps 2020-05-26 11:51:25 +02:00
Michael Barz
9175cd2bd5 Merge pull request #290 from owncloud/update-extensions
Update extensions thumbnails and reva to tagged versions
2020-05-26 09:34:35 +02:00
Artur Neumann
9b39dfef62 add REVA_LDAP_SCHEMA_* settings in drone 2020-05-26 10:23:38 +05:45
Vincent Petry
18ff7841c9 Drone: install mime.types for OCIS
Needed for mimetype detection
2020-05-25 16:35:49 +02:00
Vincent Petry
88c1ecd957 Update extensions
- ocis-thumbnails v0.1.2 (tag)
- ocis-reva v0.3.0 (tag)
2020-05-25 16:35:46 +02:00
Artur Neumann
dfc50c1d82 Merge pull request #288 from owncloud/ci-trigger
[Tests-Only] fix configuration variables for ui test in CI
2020-05-25 15:02:43 +05:45
Dipak Acharya
6e13212de0 [Tests-Only] fix configuration variables for ui test in CI 2020-05-25 09:42:25 +05:45
Michael Barz
5e5270eb17 Merge pull request #274 from owncloud/docs-tracing
Add basic docs for tracing
2020-05-14 20:43:55 +02:00
Benedikt Kulmann
69fe9d7a13 Add basic docs for tracing 2020-05-14 16:35:02 +02:00
Artur Neumann
e99c3b33ac Merge pull request #276 from owncloud/fix-skeleton-path
[Tests-only] Fix skeleton directory path
2020-05-14 15:41:12 +05:45
HariBhandari07
52b4367897 [Tests-only] Fix skeleton directory path 2020-05-14 13:37:45 +05:45
Artur Neumann
323ca3039e Merge pull request #275 from owncloud/skeleton
[Tests-only] Create test-skeleton files while creating user
2020-05-13 20:00:03 +05:45
Artur Neumann
51337cc1bb [Tests-only] Create test-skeleton files while creating user 2020-05-13 18:56:28 +05:45
Artur Neumann
959da5d988 Automated changelog update [skip ci] 2020-05-13 08:46:25 +00:00
Artur Neumann
bcd3b26db4 Merge pull request #273 from owncloud/update-ocis-reva-for-the-love-of-ci
Update ocis-reva, fixing CI issues
2020-05-13 14:05:51 +05:45
Artur Neumann
ee75f7bcef revert selenium chrome docker image to 3.141.59-20200326 2020-05-13 09:49:56 +02:00
Vincent Petry
dd985d90b2 Update ocis-reva, fixing CI issues 2020-05-13 09:31:53 +02:00
Vincent Petry
a1da513f74 Merge pull request #256 from owncloud/individual-it-patch-1
fix typo
2020-05-13 09:23:12 +02:00
Phil Davis
98ea8d3a3f Another typo 2020-05-13 09:34:33 +05:45
Phil Davis
ce946b33b9 Another typo 2020-05-13 09:34:33 +05:45
Artur Neumann
fd968220cc fix typo 2020-05-13 09:34:33 +05:45
Michael Barz
5a107cdfc6 Merge pull request #250 from owncloud/jnweiger-docs-eos-preconditions
Update eos.md
2020-05-07 12:35:35 +02:00
Ilja Neumann
eebf94fa8e Integrate migration import command 2020-05-07 09:36:28 +02:00
Jürgen Weigert
59bea24b91 Update eos.md 2020-05-07 01:53:32 +02:00
Jürgen Weigert
67a62dabdb Update eos.md
add some preconditions
2020-05-07 01:39:16 +02:00
Jörn Friedrich Dreyer
f379b27026 Merge pull request #247 from owncloud/fix-eos-start
Use latest eos docker image
2020-05-06 20:58:57 +02:00
Jörn Friedrich Dreyer
fad1dd5cd0 Merge branch 'master' into fix-eos-start 2020-05-06 18:26:32 +02:00
Jörn Friedrich Dreyer
dffe0296a7 Merge pull request #246 from butonic/update-login-flow
update login and request flow diagrams
2020-05-06 18:26:04 +02:00
Michael Barz
1d9e862a48 Use latest eos docker image 2020-05-06 17:19:13 +02:00
Jörn Friedrich Dreyer
d7848526c0 update request flow
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-05-06 16:49:34 +02:00
Jörn Friedrich Dreyer
4cb105178b update login flow
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-05-06 15:47:19 +02:00
David Toledo
600629146f Merge pull request #245 from owncloud/update_bridge_doc
Update bridge documentation
2020-05-05 23:24:42 +02:00
David Toledo
a8d7a6590b Update bridge documentation
Update bridge documentation to current code status
2020-05-05 17:39:42 +02:00
Vincent Petry
2f29c60ff1 Merge pull request #244 from owncloud/readmeUpdate
Fix typo and Update Copyright
2020-05-05 08:40:54 +02:00
David Toledo
27df2766c5 Fix typo and Update Copyright 2020-05-05 07:45:59 +02:00
Jörn Friedrich Dreyer
e1826f41cb Merge pull request #243 from butonic/documentloging-flow
Document login flow
2020-05-04 22:46:41 +02:00
Jörn Friedrich Dreyer
b3ca52ec39 Document login flow
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-05-04 20:44:34 +02:00
Ilja Neumann
654a24d6d4 Fix copyright (#242) 2020-05-04 18:08:22 +02:00
Vincent Petry
378af81d7c Add info about needing to accept self-signed cert 2020-05-04 16:50:59 +02:00
Michael Barz
cb8e71f758 Merge pull request #236 from owncloud/add-basic-setup
add simple remote setup to docs
2020-05-04 11:57:13 +02:00
Ilja Neumann
3f3d7470c5 Automated changelog update [skip ci] 2020-04-30 13:53:52 +00:00
Ilja Neumann
b0d984c252 Integrate ocis-accounts 2020-04-30 15:08:44 +02:00
Jörn Friedrich Dreyer
9df7c32675 Merge branch 'master' into add-basic-setup 2020-04-30 12:00:58 +02:00