summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-03-1126-6/+34
|
* 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-101-7/+3
|\ \ | | | | | | Update check for outdated php version.
| * | Update check for outdated php version.Daniel Kesselberg2020-02-241-7/+3
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #19812 from nextcloud/enh/noid/subscription-configRoeland Jago Douma2020-03-102-1/+16
|\ \ \ | | | | | | | | 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-101-1/+3
| | | | | | | | | | | | | | | | 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 #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 #19746 from nextcloud/locked-exception-forward-existingRoeland Jago Douma2020-03-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | 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-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #19820 from nextcloud/fix/mismatching-docblock-return-typeChristoph Wurst2020-03-091-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix mismatching docblock return types
| * | | | | | Fix mismatching docblock return typesChristoph Wurst2020-03-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Remove deprecated global variablesChristoph Wurst2020-03-092-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | 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>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-0910-0/+12
| | | | | |
* | | | | | Bump clipboard from 2.0.4 to 2.0.6dependabot-preview[bot]2020-03-084-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Bump webpack from 4.41.6 to 4.42.0dependabot-preview[bot]2020-03-0845-111/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #19836 from ↵Roeland Jago Douma2020-03-084-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/vue-infinite-loading-2.4.5 Bump vue-infinite-loading from 2.4.4 to 2.4.5
| * | | | | | Bump vue-infinite-loading from 2.4.4 to 2.4.5dependabot-preview[bot]2020-03-084-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-084-0/+18
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-03-0716-12/+20
| | | | | |
* | | | | | Merge pull request #19763 from ↵Joas Schilling2020-03-063-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/received-share-sidebar-broken Fix "Error loading the shares list TypeError: "this is undefined"" fo…
| * | | | | Fix "Error loading the shares list TypeError: "this is undefined"" for ↵Joas Schilling2020-03-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conversation shares Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #19440 from nextcloud/fix/filename_popovermenu_misalignmentJohn Molakvoæ2020-03-062-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix filename and popover menu misalignment
| * | | | | | Fix filename and popover menu misalignmentGretaD2020-02-122-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | | | | | | [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 documents
| * | | | | | | Fix regex for office documentsDaniel Kesselberg2020-03-023-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | | Merge pull request #19769 from nextcloud/bugfix/noid/share-owner-avatarRoeland Jago Douma2020-03-053-23/+22
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix avatar in file list for users with an @ in the uid
| * | | | | | | Bump bundlesJulius Härtl2020-03-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Fix regex to not take email uids as federated idsJulius Härtl2020-03-031-21/+20
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | Fix JS regexJoas Schilling2020-03-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>