summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use contacts name on federated activitiesJoas Schilling2020-03-104-38/+84
* 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove deprecated global variablesChristoph Wurst2020-03-0915-293/+127
|/ / / / /
* | | | | Merge pull request #19799 from nextcloud/rakekniven-patch-1Roeland Jago Douma2020-03-093-4/+4
|\ \ \ \ \
| * | | | | l10n: Fixed typorakekniven2020-03-093-4/+4
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2020-03-0910-0/+12
* | | | | Merge pull request #19840 from nextcloud/dependabot/npm_and_yarn/clipboard-2.0.6Roeland Jago Douma2020-03-088-17/+17
|\ \ \ \ \
| * | | | | Bump clipboard from 2.0.4 to 2.0.6dependabot-preview[bot]2020-03-088-17/+17
* | | | | | Merge pull request #19838 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2020-03-082-7/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump @babel/core from 7.8.6 to 7.8.7dependabot-preview[bot]2020-03-082-7/+33
* | | | | | Merge pull request #19841 from nextcloud/dependabot/npm_and_yarn/webpack-4.42.0Roeland Jago Douma2020-03-0856-164/+143
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump webpack from 4.41.6 to 4.42.0dependabot-preview[bot]2020-03-0856-164/+143
|/ / / / /
* | | | | Merge pull request #19837 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2020-03-082-1069/+56
|\ \ \ \ \
| * | | | | Bump @babel/preset-env from 7.8.6 to 7.8.7dependabot-preview[bot]2020-03-072-1069/+56
* | | | | | Merge pull request #19836 from nextcloud/dependabot/npm_and_yarn/vue-infinite...Roeland Jago Douma2020-03-086-19/+19
|\ \ \ \ \ \
| * | | | | | Bump vue-infinite-loading from 2.4.4 to 2.4.5dependabot-preview[bot]2020-03-086-19/+19
| |/ / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2020-03-086-2/+20
|/ / / / /
* | | | | Merge pull request #19815 from nextcloud/bugfix/noid/prevent-self-xss-via-inv...Roeland Jago Douma2020-03-071-3/+3
|\ \ \ \ \
| * | | | | Prevent self-xss via invalid mysql user name on install screenJoas Schilling2020-03-061-3/+3
| |/ / / /
* | | | | Merge pull request #19606 from sndrr/ipv6-trusted-domainsRoeland Jago Douma2020-03-071-0/+4
|\ \ \ \ \
| * | | | | Added IPv6 exampleSander Ruitenbeek2020-03-071-0/+4
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-0718-14/+22
* | | | | | Merge pull request #19770 from nextcloud/dependabot/composer/aws/aws-sdk-php-...Christoph Wurst2020-03-061-0/+0
|\ \ \ \ \ \
| * | | | | | Bump aws/aws-sdk-php from 3.133.23 to 3.133.27Christoph Wurst2020-03-061-0/+0
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #19763 from nextcloud/bugfix/noid/received-share-sidebar-b...Joas Schilling2020-03-063-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix "Error loading the shares list TypeError: "this is undefined"" for conver...Joas Schilling2020-03-033-3/+3
* | | | | | Merge pull request #19440 from nextcloud/fix/filename_popovermenu_misalignmentJohn Molakvoæ2020-03-062-8/+10
|\ \ \ \ \ \
| * | | | | | Fix filename and popover menu misalignmentGretaD2020-02-122-8/+10
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-0620-14/+90
* | | | | | | Merge pull request #19721 from nextcloud/bug/19695/workflow-regex-officeRoeland Jago Douma2020-03-053-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix regex for office documentsDaniel Kesselberg2020-03-023-5/+5
| | |_|_|_|/ / | |/| | | | |