Commit graph

45779 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
be0f625555
Merge branch 'master' into babel-npm-webpack-fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-26 09:44:41 +02:00
Nextcloud bot
2f45045c96
[tx-robot] updated from transifex 2018-09-26 00:12:23 +00:00
Morris Jobke
ee73f6c416
Merge pull request #11240 from nextcloud/feature/noid/consider-openssl-settings-from-config.php
Consider openssl settings from config.php
2018-09-25 18:04:20 +02:00
Roeland Jago Douma
b8418b502d
Merge pull request #11316 from nextcloud/container-queryexception-only
only catch QueryException when trying to build class
2018-09-25 16:21:55 +02:00
Roeland Jago Douma
4a59725b15
Merge pull request #11123 from CrazyEasy/patch-1
Bugfix 2FA theme: buttons white
2018-09-25 16:20:27 +02:00
Roeland Jago Douma
548f4e9a27
Merge pull request #11143 from nextcloud/feature/2fa-occ-revamp
[Mandatory 2FA] occ commands revamp
2018-09-25 16:06:30 +02:00
Roeland Jago Douma
34c17ba142
Merge pull request #11309 from nextcloud/bugfix/noid/dont-ignore-cloud-federation-api
Do not ignore cloud_federation_api
2018-09-25 16:04:21 +02:00
Roeland Jago Douma
77aaa493d7
Merge pull request #11363 from nextcloud/update/npm/updatenotifications
[npm] Bump updatenotifications
2018-09-25 16:01:57 +02:00
Roeland Jago Douma
768047615f
Merge pull request #11368 from nextcloud/content-list-flex-fixes
Fix default flex shrink on list
2018-09-25 14:28:58 +02:00
Morris Jobke
c62f29b9fe
Merge pull request #11364 from nextcloud/update/npm/accessibility
[npm] Bump accessibility
2018-09-25 14:25:24 +02:00
Morris Jobke
f589641870
Merge pull request #11365 from nextcloud/update/npm/settings
[npm] Bump settings
2018-09-25 14:24:49 +02:00
Morris Jobke
00eae64b7d
Merge pull request #11362 from nextcloud/update/npm/oauth2
[npm] Bump oauth2
2018-09-25 14:15:03 +02:00
John Molakvoæ (skjnldsv)
7a8b260c27
Fix default flex shrink on list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-09-25 10:36:46 +02:00
Christoph Wurst
7586b19e52
Only allow 2FA state changs if providers support the operation
Ref https://github.com/nextcloud/server/issues/11019.

Add `twofactorauth:cleanup` command

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-09-25 09:54:20 +02:00
Roeland Jago Douma
92fa373314
Merge pull request #11297 from nextcloud/bugfix/noid/this-database-dude
Copy the expiration from 480864b3e3 to …
2018-09-25 09:04:44 +02:00
Roeland Jago Douma
febb7887f0
[npm] Bump settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-25 08:52:16 +02:00
Roeland Jago Douma
3d3f058294
[npm] Bump accessibility
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-25 08:49:05 +02:00
Roeland Jago Douma
7bb298e105
[npm] Bump updatenotifications
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-25 08:44:52 +02:00
Roeland Jago Douma
d1e14dedba
[npm] Bump oauth2
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-25 08:41:48 +02:00
Roeland Jago Douma
d616782773
Merge pull request #11249 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.4.2
Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2
2018-09-25 08:39:27 +02:00
Nextcloud bot
bdb01064e2
[tx-robot] updated from transifex 2018-09-25 00:12:07 +00:00
Morris Jobke
50a280338e
Merge pull request #11337 from nextcloud/feature/noid/add-test-for-11134
Add simple unit test for findLanguageFromLocale
2018-09-24 12:20:44 +02:00
blizzz
67da97c362
Merge pull request #11222 from nextcloud/gs-and-saml
make the server ready to use global scale with SAML as auth back-end
2018-09-24 12:00:13 +02:00
dependabot[bot]
58d63df420
Bump vue-loader from 15.2.6 to 15.4.2 in /apps/oauth2
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.2.6 to 15.4.2.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-24 09:57:38 +00:00
Joas Schilling
7034192a61
Merge pull request #11342 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.1.1
Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
2018-09-24 11:54:33 +02:00
dependabot[bot]
17cf2d95c2
Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits/v3.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-24 01:14:16 +00:00
Nextcloud bot
895bccd246
[tx-robot] updated from transifex 2018-09-24 00:12:14 +00:00
Daniel Kesselberg
2440ee6b84
Add simple unit test for findLanguageFromLocale
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-09-23 20:12:00 +02:00
Nextcloud bot
cce9f25d86
[tx-robot] updated from transifex 2018-09-23 00:12:30 +00:00
Nextcloud bot
bd89af478e
[tx-robot] updated from transifex 2018-09-22 00:12:06 +00:00
Robin Appelman
dccbdc8c01
only catch QueryException when trying to build class
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-21 18:32:15 +02:00
Joas Schilling
68223e5066
Do not ignore cloud_federation_api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-21 11:52:11 +02:00
Nextcloud bot
0211e17e3f
[tx-robot] updated from transifex 2018-09-21 00:12:08 +00:00
Robin Appelman
d890cd6a4c
fix sharing trashbin integration tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:59 +02:00
Robin Appelman
073fddcc28
fix trashbin infoparsers interfering with other dav clients
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:56 +02:00
Robin Appelman
d4087811e5
more trashbin integration tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:53 +02:00
Robin Appelman
8491c9bdc6
fix trashbin integration tests and add a few more
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:50 +02:00
Robin Appelman
26e2957aea
quote paths in behat.yml
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:47 +02:00
Robin Appelman
a7a06b2349
use dav trashbin api for restore
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:44 +02:00
Robin Appelman
0c6e154b50
use dav trash api for removing from trashbin
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:41 +02:00
Robin Appelman
dea1e55b62
remove old trashbin api
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:38 +02:00
Robin Appelman
a623e09868
remove old trashbin endpoint
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:36 +02:00
Robin Appelman
b4e452ad60
Use trashbin dav endpoint to list trash in webui
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:33 +02:00
Robin Appelman
91066954a8
pass existing data to info parsers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:30 +02:00
Robin Appelman
6372ae3a98
expose additional props from trashbin sabre endpoint
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-09-20 17:03:26 +02:00
Joas Schilling
58e281857f
Merge pull request #11228 from nextcloud/fix/11144/empty-favorite-names
Fixes empty favorite names for trailing slashes
2018-09-20 13:42:50 +02:00
Joas Schilling
f258e65f13
Also adjust the expiration of PublicKeyTokenProvider
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-20 09:54:27 +02:00
Nextcloud bot
75ec460d05
[tx-robot] updated from transifex 2018-09-20 00:12:58 +00:00
blizzz
30dbbfbd45
Merge pull request #11292 from nextcloud/revert/9442/do-not-apcu-cache-the-autoloader
Revert "Use APCu caching of composer"
2018-09-19 19:39:00 +02:00
Joas Schilling
5e6187926f
Copy the expiration from 480864b3e3 to getTokenById
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-19 17:55:48 +02:00