Commit Graph
4128 Commits
Author SHA1 Message Date
d311d415b1 Example on how to deploy ocis-web in front of ownCloud10
This deployment scenario shows how to use ocis as frontend for an existing ownCloud 10 production installation. It enables
ownCloud 10 users to log in and work with their files using the new ocis-web UI. While the scenario includes
an ownCloud 10 instance, it only exists to show the necessary configuration for your already existing ownCloud 10
installation.

The setup can be used for:
- Trying out the new UI on ownCloud 10. Users can switch dynamically
- It is a prequisite for future zero-downtime migrations.

Co-authored-by: Ilja Neumann <ineumann@owncloud.com>
Co-authored-by: Jan Müller <jan.mueller@catdev.io>
Co-authored-by: Phil Davis <phil@jankaritech.com>
2020-11-12 09:48:33 +01:00
Benedikt KulmannandGitHub f19acadd1b Merge pull request #842 from owncloud/ocis-root-config
Ocis root config
2020-11-11 19:44:35 +01:00
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
Phil DavisandGitHub 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
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
jasson99andPhil Davis 62b51fb75e bump latest core commit to run tests previously tagged with toImplementOnOcis tags 2020-11-11 15:44:51 +05:45
David ChristofasandGitHub 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 ChristofasandPhil Davis 14063508bb make hash difficulty configurable 2020-11-11 10:26:33 +05:45
David ChristofasandPhil Davis 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 DavisandGitHub 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 DavisandGitHub 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 UngerandGitHub 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 KulmannandGitHub ad3ecbde46 Merge pull request #835 from butonic/fix-820
fix 820 - race condition
2020-11-10 15:48:27 +01:00
Benedikt KulmannandGitHub 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 AcharyaandGitHub 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
Benedikt Kulmann a627a405bd Automated changelog update [skip ci] 2020-11-07 07:48:58 +00:00
Benedikt KulmannandGitHub 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 DreyerandGitHub 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 BarzandGitHub 17198620ac [docs-only] Fix broken link 2020-11-06 13:56:37 +01:00
Phil DavisandGitHub 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 AcharyaandPhil Davis 5d9809e812 [Tests-Only] update core commitid for test runner 2020-11-06 17:49:06 +05:45
A.UngerandPhil Davis ecd2b8474d ditto for seettings & webdav 2020-11-06 08:25:31 +05:45
A.UngerandPhil Davis dbbe58e440 add changelog file 2020-11-06 08:25:31 +05:45
A.UngerandPhil Davis 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 DreyerandGitHub 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 DreyerandGitHub 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
Alex UngerandGitHub 681885d06e Merge pull request #790 from butonic/add-scripts-folder 2020-11-05 16:03:16 +01:00
Alex Unger ca75ce7cfb Automated changelog update [skip ci] 2020-11-05 13:55:13 +00:00
Alex UngerandGitHub 2d1d2d0c47 Merge pull request #675 from owncloud/config-housekeeping-proxy 2020-11-05 14:13:28 +01:00
Alex UngerandGitHub 6b05e9296c Merge pull request #806 from owncloud/normalize-changelog-extensions
Normalize Changelog File Extensions
2020-11-05 14:10:32 +01:00
A.Unger 246969e376 normalize changelog extensions 2020-11-05 13:15:47 +01:00
Jörn Friedrich Dreyer fdfd4040b7 skip accounts web ui tests, as users can list themselves
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2020-11-05 13:06:05 +01:00