Commit Graph

256 Commits

Author SHA1 Message Date
Ilja Neumann
b0d984c252 Integrate ocis-accounts 2020-04-30 15:08:44 +02:00
Michael Barz
f0c5ccaaa5 Merge pull request #238 from owncloud/fix-pw
fix wrong credentials in docs
2020-04-29 21:58:13 +02:00
Jörn Friedrich Dreyer
249746c631 Merge branch 'master' into fix-pw 2020-04-29 21:10:49 +02:00
Jörn Friedrich Dreyer
78a02a96c0 Merge pull request #237 from butonic/use-correct-hint-markdown
use correct hint markdown
2020-04-29 15:18:06 +02:00
Michael Barz
1b8e04d945 fix wrong credentials in docs 2020-04-29 14:20:56 +02:00
Jörn Friedrich Dreyer
4b24771233 use correct hint markdown
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-04-29 14:11:42 +02:00
Michael Barz
3c5c0f5a0b Fixed wrong pw in docs 2020-04-29 10:38:49 +02:00
Michael Barz
6a1f71539c Merge pull request #218 from owncloud/bddUsingoc10Tests
[Tests-only] document how to use oC10 API tests for BDD in ocis
2020-04-29 08:01:11 +02:00
Artur Neumann
df9e021246 document how to use oC10 API tests for BDD in ocis 2020-04-29 09:06:41 +05:45
Ilja Neumann
f2943d0a26 Automated changelog update [skip ci] 2020-04-28 14:37:04 +00:00
Michael Barz
3c76a6a290 Merge pull request #234 from owncloud/update/deps
Update Extensions
2020-04-28 16:28:49 +02:00
Ilja Neumann
a5c034dddb Extensions diagram 2020-04-28 15:50:35 +02:00
A.Unger
852727cef0 add changelog 2020-04-28 15:18:46 +02:00
A.Unger
77b6cd065e update ocis-phoenix, ocis-reva, ocis-thumbnails 2020-04-28 15:05:49 +02:00
A.Unger
6cd1ebfcc5 update ocis-pkg 2020-04-28 09:20:58 +02:00
felixboehm
a049d816b1 Merge pull request #229 from butonic/request-flow-docs
Initial request flow documentation
2020-04-27 18:31:36 +02:00
Jörn Friedrich Dreyer
6ac0f969a4 add initial request flow docs
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-04-27 16:10:58 +02:00
Michael Barz
f9efbd429e Merge pull request #221 from owncloud/fixConfigForLogout
[Tests-only] add slash at the end of redirect_uri to allow correct logout
2020-04-27 08:55:06 +02:00
Michael Barz
1f7d13cba7 Merge pull request #220 from owncloud/simplifyTests
[Tests-only] remove need to authorize phoenix in kopano
2020-04-24 12:26:00 +02:00
Artur Neumann
1e03f72754 add slash at the end of redirect_uri to allow correct logout 2020-04-24 11:38:22 +05:45
Artur Neumann
abf222e6c5 remove need to authorize phoenix in kopano 2020-04-24 11:14:26 +05:45
Jörn Friedrich Dreyer
9687132afd Automated changelog update [skip ci] 2020-04-23 06:58:24 +00:00
Jörn Friedrich Dreyer
41a8c7b6f4 Merge pull request #217 from butonic/fix-eos
make ocis on eos great again
2020-04-23 08:09:25 +02:00
Jörn Friedrich Dreyer
22ef5b457c make ocis on eos great again
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-04-22 20:44:03 +02:00
Jörn Friedrich Dreyer
19d1d0ad40 Merge pull request #176 from butonic/fix-simple
partially fix simple build
2020-04-17 09:37:40 +02:00
Alex Unger
f099fbd2ae Merge branch 'master' into fix-simple 2020-04-17 08:49:27 +02:00
Jörn Friedrich Dreyer
a139cccecd Merge pull request #204 from owncloud/make-clean-identifier
remove identifier-registration.yaml during make clean
2020-04-17 07:04:52 +02:00
Jörn Friedrich Dreyer
3daa0ac5c1 Merge branch 'master' into make-clean-identifier 2020-04-16 22:47:39 +02:00
Michael Barz
4e575d422e Automated changelog update [skip ci] 2020-04-16 14:40:15 +00:00
Michael Barz
eb755f1ee4 Merge pull request #209 from owncloud/release-1.0.0-beta3
Prepare 1.0.0beta3 release
2020-04-16 16:01:20 +02:00
Jörn Friedrich Dreyer
b16636c69d Automated changelog update [skip ci] 2020-04-16 12:48:19 +00:00
Michael Barz
6117faabc7 Prepare 1.0.0beta3 release 2020-04-16 14:15:07 +02:00
Jörn Friedrich Dreyer
cc5e5c40ea Merge branch 'master' into make-clean-identifier 2020-04-16 14:05:34 +02:00
Jörn Friedrich Dreyer
2daae9e273 Merge pull request #172 from butonic/ocis-on-eos
[WIP] add eos to makefile
2020-04-16 14:04:58 +02:00
Jörn Friedrich Dreyer
774e4f9931 Merge branch 'master' into make-clean-identifier 2020-04-16 13:46:05 +02:00
Jörn Friedrich Dreyer
f9579c14ff make clean also run clean-config 2020-04-16 13:45:45 +02:00
Michael Barz
f535da3b48 remove identifier-registration.yaml during make clean 2020-04-16 12:25:41 +02:00
Jörn Friedrich Dreyer
5ed1bc08a2 add eos to makefile
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-04-15 20:38:42 +02:00
Michael Barz
f249c59158 Merge pull request #205 from owncloud/update-flaex-template
Update flaex template
2020-04-15 12:54:46 +02:00
Michael Barz
fe16ff6e73 update flaex template 2020-04-15 12:03:14 +02:00
Michael Barz
454d29e7d8 Add Flagset extractor, generate configuration docs 2020-04-15 12:03:14 +02:00
Michael Barz
e0f01a4971 Merge pull request #206 from owncloud/cp-config-into-dist
Added config.json inside phoenix dist
2020-04-15 12:03:02 +02:00
Parajuli Kiran
bf6e8cc9c0 config.json added inside phoenix dist folder 2020-04-15 14:46:39 +05:45
Artur Neumann
ed1ab2f3fb Merge pull request #181 from owncloud/drone-phoenix-webui
[Tests-Only] Run phoenix webui acceptance tests
2020-04-06 11:24:55 +05:45
Kiran Parajuli
62aefa0f5c Run phoenix webui acceptance tests 2020-04-06 09:24:53 +05:45
Michael Barz
0e0499c1fb Merge pull request #173 from owncloud/add-flaex
Add Flagset extractor, generate configuration docs
2020-04-04 21:33:20 +02:00
Michael Barz
fb32128ab0 Merge pull request #162 from butonic/add-debug-docs
Add debugging docs
2020-04-04 00:02:19 +02:00
Michael Barz
fd36f66099 Add Flagset extractor, generate configuration docs 2020-04-03 23:43:46 +02:00
Michael Barz
506a821280 Merge pull request #158 from butonic/fix_debug_build
do not strip debug data for debug build
2020-04-03 22:39:04 +02:00
Michael Barz
98b0fc8ae6 Automated changelog update [skip ci] 2020-04-01 10:25:22 +00:00