summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get correct mimetype on objectstoresRoeland Jago Douma2020-03-111-6/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #19861 from ↵Joas Schilling2020-03-111-0/+4
|\ | | | | | | | | nextcloud/bugfix/noid/load-remote-shares-also-when-one-is-down Don't break when one remote share is down
| * Don't break when one remote share is downJoas Schilling2020-03-091-0/+4
| | | | | | | | | | | | getFileInfo can also return false Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #19839 from ↵Roeland Jago Douma2020-03-1138-705/+712
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/nextcloud/vue-1.4.0 Bump @nextcloud/vue from 1.3.1 to 1.4.0
| * | Bump @nextcloud/vue from 1.3.1 to 1.4.0dependabot-preview[bot]2020-03-1038-705/+712
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/nextcloud/nextcloud-vue/releases) - [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-03-11128-108/+136
| | |
* | | Merge pull request #19173 from ↵Roeland Jago Douma2020-03-105-135/+221
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix-displayname-of-contacts-in-remote-activities Use contacts name on federated activities
| * | | Fix unit testsJoas Schilling2020-03-101-56/+75
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Unify the code a bitJoas Schilling2020-03-104-53/+74
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Use contacts name on federated activitiesJoas Schilling2020-03-104-38/+84
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #19580 from nextcloud/debt/noid/outdated-checkRoeland Jago Douma2020-03-102-13/+9
|\ \ \ \ | | | | | | | | | | Update check for outdated php version.
| * | | | Update check for outdated php version.Daniel Kesselberg2020-02-242-13/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #19867 from Jose123456/error-loggingRoeland Jago Douma2020-03-101-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Set error_logging correctly. Fixes #19847
| * | | | E_ALL already sets E_DEPRECATEDJose Quinteiro2020-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose Quinteiro <github@quinteiro.org>
| * | | | Set error_logging correctly. Fixes #19847Jose Quinteiro2020-03-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't override the error_logging setting from php.ini unless we're debugging. Signed-off-by: Jose Quinteiro <github@quinteiro.org>
* | | | | Merge pull request #19812 from nextcloud/enh/noid/subscription-configRoeland Jago Douma2020-03-104-2/+46
|\ \ \ \ \ | | | | | | | | | | | | Add config flag for subscription and hide server development notice
| * | | | | Add system config flag to manually set that a subscription is availableJulius Härtl2020-03-103-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Hide development notice when subscription is validJulius Härtl2020-03-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #19862 from ↵Joas Schilling2020-03-101-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/techdebt/noid/fix-editor-config-for-tests Fix editor config for integration test files
| * | | | | | Fix editor config for integration test filesJoas Schilling2020-03-091-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #18555 from nextcloud/bugfix/18530/edit-own-userRoeland Jago Douma2020-03-1024-237/+13989
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow to edit admin/own user in the user management
| * | | | | | Bump bundlesJulius Härtl2020-03-1018-226/+13971
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Fix group navigationJulius Härtl2020-03-102-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Fix row height and display name inputJulius Härtl2020-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Allow to edit admin/own user in the user managementJulius Härtl2020-03-103-7/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #19698 from nextcloud/fix/fix_image_preview_deleted_sharesRoeland Jago Douma2020-03-105-5/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix default action for deleted shares
| * | | | | Fix default action for deleted sharesGretaD2020-03-095-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | Merge pull request #19871 from nextcloud/bugfix/14469/combine-move-activitiesRoeland Jago Douma2020-03-101-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Combine move activities as well
| * | | | | | Combine move activities as wellJoas Schilling2020-03-101-1/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-1036-72/+82
| |/ / / / |/| | | |
* | | | | Merge pull request #19704 from Nils160988/masterRoeland Jago Douma2020-03-092-5/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix hostname in Apple configuration profile
| * | | | | Fix testNils Wittenbrink2020-02-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
| * | | | | Fix hostname given in Apple config fileNils Wittenbrink2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nils Wittenbrink <nilswittenbrink@web.de>
* | | | | | Merge pull request #19711 from nextcloud/dependabot/npm_and_yarn/mocha-7.1.0Roeland Jago Douma2020-03-092-9/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump mocha from 7.0.1 to 7.1.0
| * | | | | | Bump mocha from 7.0.1 to 7.1.0dependabot-preview[bot]2020-03-022-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [mocha](https://github.com/mochajs/mocha) from 7.0.1 to 7.1.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v7.0.1...v7.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | | Merge pull request #19863 from nextcloud/bugfix/noid/no-tabs-in-translationsRoeland Jago Douma2020-03-093-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | No tabs in translations
| * | | | | | | No tabs in translationsJoas Schilling2020-03-093-4/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #19746 from nextcloud/locked-exception-forward-existingRoeland Jago Douma2020-03-093-5/+20
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | pass the existing locks info when making locked exception with absolu…
| * | | | | | pass the existing locks info when making locked exception with absolute pathsRobin Appelman2020-03-023-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | Merge pull request #19820 from nextcloud/fix/mismatching-docblock-return-typeChristoph Wurst2020-03-096-8/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix mismatching docblock return types
| * | | | | | | Fix mismatching docblock return typesChristoph Wurst2020-03-066-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #19795 from nextcloud/enhancement/address-book-pluginsChristoph Wurst2020-03-099-20/+303
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Add address book plugins
| * | | | | | | Prevent creation of reserved address book nameChristoph Wurst2020-03-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | Add address book pluginsChristoph Wurst2020-03-099-20/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #19819 from nextcloud/fix/mismatching-docblock-param-typeRoeland Jago Douma2020-03-096-6/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix mismatching doc block parameter types
| * | | | | | | | Fix mismatching doc block parameter typesChristoph Wurst2020-03-066-6/+7
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #19357 from nextcloud/techdebt/remove-deprecated-globalsChristoph Wurst2020-03-0915-293/+127
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Remove deprecated global variables
| * | | | | | | Remove deprecated global variablesChristoph Wurst2020-03-0915-293/+127
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #19799 from nextcloud/rakekniven-patch-1Roeland Jago Douma2020-03-093-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | l10n: Fixed typo
| * | | | | | | l10n: Fixed typorakekniven2020-03-093-4/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: rakekniven <mark.ziegler@rakekniven.de> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 12:43:15 +0000