Commit Graph

4334 Commits

Author SHA1 Message Date
Benedikt Kulmann
295b945123 Changelog 2020-11-11 17:14:54 +01:00
Benedikt Kulmann
15df700b27 Move default configs to root level 2020-11-11 17:12:14 +01:00
A.Unger
c3ab3e7985 fix linter 2020-11-11 16:12:41 +01:00
A.Unger
951a441f65 cleanup old comments 2020-11-11 15:52:13 +01:00
A.Unger
83d9b0c97d Merge branch 'master' into ocis-1018 2020-11-11 15:38:46 +01:00
A.Unger
39deac6e74 parse address from MICRO_REGISTRY_ADDRESS 2020-11-11 15:36:53 +01:00
A.Unger
d0e28b6345 rely on MICRO_REGISTRY to swap registries 2020-11-11 15:28:22 +01:00
A.Unger
4c1f14fc47 use etcd as registry on rpc client 2020-11-11 14:08:58 +01:00
Phil Davis
dc61b11850 Merge pull request #798 from owncloud/remove_toImplementOnOcis_tags
[Tests-Only] Bump latest core commit after toImplementOnOcis tags is removed
2020-11-11 16:37:17 +05:45
A.Unger
76c633e650 wip 2020-11-11 11:50:53 +01:00
David Christofas
c9c3f5c8fa Automated changelog update [skip ci] 2020-11-11 10:15:01 +00:00
Phil Davis
0bf60e07a5 Split core API tests into 10 pipelines 2020-11-11 15:45:03 +05:45
jasson99
62b51fb75e bump latest core commit to run tests previously tagged with toImplementOnOcis tags 2020-11-11 15:44:51 +05:45
David Christofas
efe3702cea Merge pull request #638 from owncloud/accounts-change-hashing-algorithm
change hashing algorithm from SHA-512 to bcrypt
2020-11-11 10:14:36 +01:00
David Christofas
14063508bb make hash difficulty configurable 2020-11-11 10:26:33 +05:45
David Christofas
7115b6f661 change hashing algorithm from SHA-512 to bcrypt
Even though SHA-512 is currently considered a secure algorithm it is not the best choice for password hashing. As this change introduces a breaking change it is beast to introduce it as early as possible to prevent us from having to implement a migration strategy

Signed-off-by: David Christofas <dchristofas@owncloud.com>
2020-11-11 10:26:33 +05:45
Phil Davis
ec8a45a508 Merge pull request #836 from owncloud/bump-ui-test-commit-id-20201111
[tests-only] Bump phoenix commit id used for UI tests
2020-11-11 10:24:57 +05:45
Phil Davis
f7e6974d13 Bump phoenix commit id used for UI tests 2020-11-11 09:44:15 +05:45
Phil Davis
6807676dc9 Automated changelog update [skip ci] 2020-11-11 03:16:09 +00:00
Phil Davis
7f1eef36d8 Merge pull request #808 from owncloud/fix-672
Use copy of config instead of modifying the original configuration
2020-11-11 08:19:39 +05:45
Alex Unger
da25289ccc Update fix-672.md 2020-11-10 19:20:20 +01:00
Benedikt Kulmann
2ddc10286d Automated changelog update [skip ci] 2020-11-10 15:30:25 +00:00
A.Unger
d6e25798f7 Merge branch 'master' into fix-672 2020-11-10 15:49:24 +01:00
Benedikt Kulmann
ad3ecbde46 Merge pull request #835 from butonic/fix-820
fix 820 - race condition
2020-11-10 15:48:27 +01:00
Benedikt Kulmann
f16c6ea38f Merge pull request #834 from owncloud/update-glauth
Update glauth
2020-11-10 15:47:34 +01:00
Jörn Friedrich Dreyer
0c6e8881c3 fix 820 - race condition
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-10 15:07:27 +01:00
Benedikt Kulmann
945f2ee5a9 Update glauth 2020-11-10 13:52:25 +01:00
Dipak Acharya
6a49e1f1af Merge pull request #822 from owncloud/bump-core-commit-id-20201109
[tests-only] Bump core commit for tests 2020-11-09
2020-11-10 14:53:18 +05:45
Phil Davis
a26914e5aa Bump core commit for tests 2020-11-10 2020-11-10 13:14:30 +05:45
Felix Böhm
abbdf80457 remove usage of missing config folder
fix #812
2020-11-09 15:53:16 +01:00
Benedikt Kulmann
a627a405bd Automated changelog update [skip ci] 2020-11-07 07:48:58 +00:00
Benedikt Kulmann
869454fe39 Merge pull request #817 from owncloud/update-phoenix
update phoenix to version 0.24.0
2020-11-06 23:11:03 +01:00
Jörn Friedrich Dreyer
c0268372d1 Automated changelog update [skip ci] 2020-11-06 22:04:47 +00:00
Jörn Friedrich Dreyer
66fd583a83 Merge pull request #816 from butonic/return-username-in-ocs-api
hide account.id in ocs api, use username
2020-11-06 21:53:35 +01:00
David Christofas
76b94bc885 update phoenix to version 0.24.0 2020-11-06 18:48:08 +01:00
Jörn Friedrich Dreyer
145671512a hide account.id in ocs api, use username
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-06 17:33:43 +01:00
Michael Barz
17198620ac [docs-only] Fix broken link 2020-11-06 13:56:37 +01:00
Phil Davis
a45b5b7bd4 Merge pull request #802 from owncloud/update-core-commit-7a32acb
[Tests-Only] update core commitid for test runner
2020-11-06 18:32:44 +05:45
Dipak Acharya
5d9809e812 [Tests-Only] update core commitid for test runner 2020-11-06 17:49:06 +05:45
A.Unger
ecd2b8474d ditto for seettings & webdav 2020-11-06 08:25:31 +05:45
A.Unger
dbbe58e440 add changelog file 2020-11-06 08:25:31 +05:45
A.Unger
bf2fa91690 do not override config, use shallow copy instead 2020-11-06 08:25:31 +05:45
Jörn Friedrich Dreyer
d3820b8c8d Automated changelog update [skip ci] 2020-11-05 23:08:21 +00:00
Jörn Friedrich Dreyer
47a877c013 Merge pull request #809 from butonic/fix-konnectd
update assets with new default config
2020-11-05 23:27:20 +01:00
Jörn Friedrich Dreyer
3d1fa00948 add TODO to makefile
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 21:54:47 +01:00
Jörn Friedrich Dreyer
be10ccfb49 add changelog
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 17:22:54 +01:00
Jörn Friedrich Dreyer
908fd41797 update Makefile with generate steps for yarn
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 17:20:31 +01:00
Jörn Friedrich Dreyer
03dc337bc6 include updated web assets
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 17:14:09 +01:00
Jörn Friedrich Dreyer
13e6d21b81 update assets with new default config
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 17:05:33 +01:00
Jörn Friedrich Dreyer
c124102df2 Merge pull request #627 from butonic/add-basic-auth-option
add enable basic auth option and check permissions
2020-11-05 16:36:16 +01:00