Commit Graph

53049 Commits

Author SHA1 Message Date
Roeland Jago Douma 0a6ba15bb2
Merge pull request #19867 from Jose123456/error-logging
Set error_logging correctly. Fixes #19847
2020-03-10 19:45:40 +01:00
Roeland Jago Douma 5e4ee4dc59
Merge pull request #19812 from nextcloud/enh/noid/subscription-config
Add config flag for subscription and hide server development notice
2020-03-10 19:39:03 +01:00
Joas Schilling 85153e8923
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 19:36:57 +01:00
Joas Schilling f4918f208e
Unify the code a bit
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 19:36:57 +01:00
Joas Schilling bbef026aa0
Use contacts name on federated activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 19:36:56 +01:00
Joas Schilling c82c1da8f7
Merge pull request #19862 from nextcloud/techdebt/noid/fix-editor-config-for-tests
Fix editor config for integration test files
2020-03-10 16:39:42 +01:00
Robin Appelman 223ee42a53
faster implementation of SFTP write stream
using mostly the same techniques as the read stream

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-03-10 16:18:40 +01:00
Roeland Jago Douma 19f286969a
Merge pull request #18555 from nextcloud/bugfix/18530/edit-own-user
Allow to edit admin/own user in the user management
2020-03-10 16:16:36 +01:00
Roeland Jago Douma 05c6086be6
Merge pull request #19698 from nextcloud/fix/fix_image_preview_deleted_shares
Fix default action for deleted shares
2020-03-10 15:52:48 +01:00
Julius Härtl b9d51863fb
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:51:53 +01:00
Julius Härtl 93e6889fb2
Fix group navigation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:49:31 +01:00
Julius Härtl 1103e8abec
Fix row height and display name input
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:49:31 +01:00
Julius Härtl bde16441a9
Allow to edit admin/own user in the user management
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:49:30 +01:00
Julius Härtl dbd63222c8
Add system config flag to manually set that a subscription is available
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-03-10 14:31:27 +01:00
Roeland Jago Douma 812f16880b
Merge pull request #19871 from nextcloud/bugfix/14469/combine-move-activities
Combine move activities as well
2020-03-10 10:36:17 +01:00
Joas Schilling 38292753ac
Combine move activities as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-10 09:32:52 +01:00
Nextcloud bot acbe08cd40
[tx-robot] updated from transifex 2020-03-10 02:18:13 +00:00
GretaD b201121e62 Fix default action for deleted shares
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-03-09 20:16:38 +00:00
Roeland Jago Douma 0d613cd2f0
Merge pull request #19704 from Nils160988/master
Fix hostname in Apple configuration profile
2020-03-09 21:02:53 +01:00
Roeland Jago Douma e934786686
Merge pull request #19711 from nextcloud/dependabot/npm_and_yarn/mocha-7.1.0
Bump mocha from 7.0.1 to 7.1.0
2020-03-09 21:02:07 +01:00
Jose Quinteiro 6995e98df6 E_ALL already sets E_DEPRECATED
Signed-off-by: Jose Quinteiro <github@quinteiro.org>
2020-03-09 12:59:54 -07:00
Roeland Jago Douma 41d2e224be
Merge pull request #19863 from nextcloud/bugfix/noid/no-tabs-in-translations
No tabs in translations
2020-03-09 20:58:59 +01:00
Jose Quinteiro 6cf679e04e Set error_logging correctly. Fixes #19847
Don't override the error_logging setting from php.ini unless we're
debugging.

Signed-off-by: Jose Quinteiro <github@quinteiro.org>
2020-03-09 12:05:21 -07:00
Roeland Jago Douma b6245be302
Merge pull request #19746 from nextcloud/locked-exception-forward-existing
pass the existing locks info when making locked exception with absolu…
2020-03-09 19:31:45 +01:00
Christoph Wurst 1f7cb027a4
Merge pull request #19820 from nextcloud/fix/mismatching-docblock-return-type
Fix mismatching docblock return types
2020-03-09 17:43:17 +01:00
Christoph Wurst 5b0dfd3fa4
Merge pull request #19795 from nextcloud/enhancement/address-book-plugins
Add address book plugins
2020-03-09 17:32:00 +01:00
Joas Schilling dfd6454e6f
No tabs in translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-09 17:16:14 +01:00
Joas Schilling 03992765e3
Fix editor config for integration test files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-09 17:12:44 +01:00
Joas Schilling 886293fdcc
Don't break when one remote share is down
getFileInfo can also return false

Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-03-09 17:00:31 +01:00
Roeland Jago Douma 5a8c7854d6
Merge pull request #19819 from nextcloud/fix/mismatching-docblock-param-type
Fix mismatching doc block parameter types
2020-03-09 16:09:23 +01:00
Christoph Wurst 0b6dbe6419
Merge pull request #19357 from nextcloud/techdebt/remove-deprecated-globals
Remove deprecated global variables
2020-03-09 15:36:19 +01:00
Christoph Wurst 827c0980d8
Prevent creation of reserved address book name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-09 13:36:39 +01:00
Christoph Wurst bb1d8b3189
Remove deprecated global variables
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-09 13:31:50 +01:00
Christoph Wurst ec245d5fec
Add address book plugins
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-09 13:12:18 +01:00
Roeland Jago Douma ac03f54079
Merge pull request #19799 from nextcloud/rakekniven-patch-1
l10n: Fixed typo
2020-03-09 12:14:14 +01:00
rakekniven 43f74894bc l10n: Fixed typo
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-03-09 08:44:12 +00:00
Nextcloud bot 4a019ab04c
[tx-robot] updated from transifex 2020-03-09 02:18:09 +00:00
Roeland Jago Douma e54ca2bb53
Merge pull request #19840 from nextcloud/dependabot/npm_and_yarn/clipboard-2.0.6
Bump clipboard from 2.0.4 to 2.0.6
2020-03-08 16:55:36 +01:00
Roeland Jago Douma 86c5c80281
Merge pull request #19838 from nextcloud/dependabot/npm_and_yarn/babel/core-7.8.7
Bump @babel/core from 7.8.6 to 7.8.7
2020-03-08 16:53:44 +01:00
dependabot-preview[bot] 923b9127d4 Bump clipboard from 2.0.4 to 2.0.6
Bumps [clipboard](https://github.com/zenorocha/clipboard.js) from 2.0.4 to 2.0.6.
- [Release notes](https://github.com/zenorocha/clipboard.js/releases)
- [Commits](https://github.com/zenorocha/clipboard.js/compare/v2.0.4...v2.0.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-03-08 13:19:24 +00:00
Roeland Jago Douma fd372a3c36
Merge pull request #19841 from nextcloud/dependabot/npm_and_yarn/webpack-4.42.0
Bump webpack from 4.41.6 to 4.42.0
2020-03-08 12:11:58 +01:00
dependabot-preview[bot] 98f5f68320 Bump webpack from 4.41.6 to 4.42.0
Bumps [webpack](https://github.com/webpack/webpack) from 4.41.6 to 4.42.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.41.6...v4.42.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-03-08 09:59:27 +00:00
dependabot-preview[bot] a0b67adacc
Bump @babel/core from 7.8.6 to 7.8.7
Bumps [@babel/core](https://github.com/babel/babel) from 7.8.6 to 7.8.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-08 09:26:02 +00:00
Roeland Jago Douma 1bc65d5775
Merge pull request #19837 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.8.7
Bump @babel/preset-env from 7.8.6 to 7.8.7
2020-03-08 10:23:34 +01:00
Roeland Jago Douma b778d0157e
Merge pull request #19836 from nextcloud/dependabot/npm_and_yarn/vue-infinite-loading-2.4.5
Bump vue-infinite-loading from 2.4.4 to 2.4.5
2020-03-08 10:22:26 +01:00
dependabot-preview[bot] e4a24a56d6 Bump vue-infinite-loading from 2.4.4 to 2.4.5
Bumps [vue-infinite-loading](https://github.com/PeachScript/vue-infinite-loading) from 2.4.4 to 2.4.5.
- [Release notes](https://github.com/PeachScript/vue-infinite-loading/releases)
- [Commits](https://github.com/PeachScript/vue-infinite-loading/compare/v2.4.4...v2.4.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-03-08 08:56:09 +00:00
Nextcloud bot 23b59cf8f7
[tx-robot] updated from transifex 2020-03-08 02:18:28 +00:00
dependabot-preview[bot] 6f12592341
Bump @babel/preset-env from 7.8.6 to 7.8.7
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.8.6 to 7.8.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.8.6...v7.8.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-07 13:31:20 +00:00
Roeland Jago Douma 1d5058b484
Merge pull request #19815 from nextcloud/bugfix/noid/prevent-self-xss-via-invalid-mysql-username
Prevent self-xss via invalid mysql user name on install screen
2020-03-07 14:19:55 +01:00
Roeland Jago Douma c9949d119b
Merge pull request #19606 from sndrr/ipv6-trusted-domains
Added IPv6 example
2020-03-07 14:10:22 +01:00