summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | [tx-robot] updated from transifexNextcloud bot2020-03-1236-20/+370
* | | | | Merge pull request #19822 from nextcloud/sftp-read-streamRoeland Jago Douma2020-03-113-0/+384
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | faster implementation of SFTP write streamRobin Appelman2020-03-103-0/+184
| * | | | Faster implementation of sftp read streamRobin Appelman2020-03-062-0/+200
* | | | | Merge pull request #19861 from nextcloud/bugfix/noid/load-remote-shares-also-...Joas Schilling2020-03-111-0/+4
|\ \ \ \ \
| * | | | | Don't break when one remote share is downJoas Schilling2020-03-091-0/+4
* | | | | | Merge pull request #19839 from nextcloud/dependabot/npm_and_yarn/nextcloud/vu...Roeland Jago Douma2020-03-1138-705/+712
|\ \ \ \ \ \
| * | | | | | Bump @nextcloud/vue from 1.3.1 to 1.4.0dependabot-preview[bot]2020-03-1038-705/+712
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-11128-108/+136
* | | | | | | Merge pull request #19173 from nextcloud/bugfix/noid/fix-displayname-of-conta...Roeland Jago Douma2020-03-105-135/+221
|\ \ \ \ \ \ \
| * | | | | | | Fix unit testsJoas Schilling2020-03-101-56/+75
| * | | | | | | Unify the code a bitJoas Schilling2020-03-104-53/+74
| * | | | | | | Use contacts name on federated activitiesJoas Schilling2020-03-104-38/+84
* | | | | | | | Merge pull request #19580 from nextcloud/debt/noid/outdated-checkRoeland Jago Douma2020-03-102-13/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Update check for outdated php version.Daniel Kesselberg2020-02-242-13/+9
* | | | | | | | | Merge pull request #19867 from Jose123456/error-loggingRoeland Jago Douma2020-03-101-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | E_ALL already sets E_DEPRECATEDJose Quinteiro2020-03-091-1/+1
| * | | | | | | | Set error_logging correctly. Fixes #19847Jose Quinteiro2020-03-091-1/+5
* | | | | | | | | Merge pull request #19812 from nextcloud/enh/noid/subscription-configRoeland Jago Douma2020-03-104-2/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add system config flag to manually set that a subscription is availableJulius Härtl2020-03-103-2/+33
| * | | | | | | | | Hide development notice when subscription is validJulius Härtl2020-03-061-0/+13
* | | | | | | | | | Merge pull request #19862 from nextcloud/techdebt/noid/fix-editor-config-for-...Joas Schilling2020-03-101-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix editor config for integration test filesJoas Schilling2020-03-091-0/+4
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #18555 from nextcloud/bugfix/18530/edit-own-userRoeland Jago Douma2020-03-1024-237/+13989
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump bundlesJulius Härtl2020-03-1018-226/+13971
| * | | | | | | | | | Fix group navigationJulius Härtl2020-03-102-4/+9
| * | | | | | | | | | Fix row height and display name inputJulius Härtl2020-03-101-0/+4
| * | | | | | | | | | Allow to edit admin/own user in the user managementJulius Härtl2020-03-103-7/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19698 from nextcloud/fix/fix_image_preview_deleted_sharesRoeland Jago Douma2020-03-105-5/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix default action for deleted sharesGretaD2020-03-095-5/+30
* | | | | | | | | | Merge pull request #19871 from nextcloud/bugfix/14469/combine-move-activitiesRoeland Jago Douma2020-03-101-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Combine move activities as wellJoas Schilling2020-03-101-1/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-1036-72/+82
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #19704 from Nils160988/masterRoeland Jago Douma2020-03-092-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix testNils Wittenbrink2020-02-291-4/+3
| * | | | | | | | | Fix hostname given in Apple config fileNils Wittenbrink2020-02-281-1/+1
* | | | | | | | | | 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.0dependabot-preview[bot]2020-03-022-9/+9
* | | | | | | | | | | Merge pull request #19863 from nextcloud/bugfix/noid/no-tabs-in-translationsRoeland Jago Douma2020-03-093-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | No tabs in translationsJoas Schilling2020-03-093-4/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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 absolute pathsRobin Appelman2020-03-023-5/+20
* | | | | | | | | | | Merge pull request #19820 from nextcloud/fix/mismatching-docblock-return-typeChristoph Wurst2020-03-096-8/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix mismatching docblock return typesChristoph Wurst2020-03-066-8/+18
* | | | | | | | | | | | Merge pull request #19795 from nextcloud/enhancement/address-book-pluginsChristoph Wurst2020-03-099-20/+303
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Prevent creation of reserved address book nameChristoph Wurst2020-03-091-0/+11
| * | | | | | | | | | | Add address book pluginsChristoph Wurst2020-03-099-20/+292
* | | | | | | | | | | | Merge pull request #19819 from nextcloud/fix/mismatching-docblock-param-typeRoeland Jago Douma2020-03-096-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix mismatching doc block parameter typesChristoph Wurst2020-03-066-6/+7
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #19357 from nextcloud/techdebt/remove-deprecated-globalsChristoph Wurst2020-03-0915-293/+127
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |