summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1136-228/+935
|\ | | | | implement federated group sharing
| * fix unit testsBjoern Schiessle2018-07-112-1/+4
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add some integration testsBjoern Schiessle2018-07-112-0/+121
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * fix js testsBjoern Schiessle2018-07-111-24/+82
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * update unit testsBjoern Schiessle2018-07-117-40/+120
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * update autoloaderBjoern Schiessle2018-07-112-0/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * start to get fed group shares into the share dialogBjoern Schiessle2018-07-116-5/+120
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * handle unshare request from ownerBjoern Schiessle2018-07-111-18/+25
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * unshare from selfBjoern Schiessle2018-07-111-10/+15
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * accept/decline group sharesBjoern Schiessle2018-07-114-15/+98
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * fix notification when a group share is receivedBjoern Schiessle2018-07-111-9/+15
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * translate nextcloud share types to OCM share typesBjoern Schiessle2018-07-111-1/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * log error messgageBjoern Schiessle2018-07-111-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * implement federated group sharesBjoern Schiessle2018-07-1114-113/+274
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * add setting to enable/disable federated group sharingBjoern Schiessle2018-07-113-2/+63
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #10143 from nextcloud/3rdparty/noid/aws-sdk-3.62.9Morris Jobke2018-07-111-0/+0
|\ \ | | | | | | [3rdparty] Bump AWS-SDK to 3.62.9
| * | [3rdparty] Bump AWS-SDK to 3.62.9Roeland Jago Douma2018-07-111-0/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9942 from ↵Roeland Jago Douma2018-07-1117-10/+1345
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/2338/invitation_response_in_email Include accept / decline links in CalDAV invitation emails
| * | | Bump version of app else migrations don't runRoeland Jago Douma2018-06-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Include accept / decline links in CalDAV invitation emailsGeorg Ehrke2018-06-2917-9/+1344
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #10197 from nextcloud/feature/9410/improve-opcache-feedbackRoeland Jago Douma2018-07-114-11/+103
|\ \ \ \ | | | | | | | | | | Improve opcache feedback
| * | | | Fix detection if opcache extension is loadedMorris Jobke2018-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Fix testsMorris Jobke2018-07-112-1/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | opcache module checkCthulhux2018-07-113-11/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved the speed of isOpcacheProperlySetup() (instant return instead of continuing when we're already failed), added a check for the opcache extension itself. Potentially fixes #9410 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #10199 from ↵Morris Jobke2018-07-112-9/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/improve-url-detection-in-comments Improve url detection in comments
| * | | | | Improve url detection in commentsJoas Schilling2018-07-112-9/+58
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10179 from nextcloud/mount-filterMorris Jobke2018-07-112-1/+30
|\ \ \ \ \ | | | | | | | | | | | | Add the option to filter mounts for a user
| * | | | | Add the option to filter mounts for a userRobin Appelman2018-07-102-1/+30
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #10025 from nextcloud/smb-rename-invalidargument-retryMorris Jobke2018-07-111-3/+17
|\ \ \ \ \ | | | | | | | | | | | | also retry rename operation on InvalidArgumentException
| * | | | | also retry rename operation on InvalidArgumentExceptionRobin Appelman2018-06-271-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #10193 from nextcloud/bugfix/10175/sanitize-parameterMorris Jobke2018-07-111-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Sanitize parameters in createSessionToken() while logging
| * | | | | Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #10122 from nextcloud/feature/noid/appdata-fopen-streamMorris Jobke2018-07-113-0/+57
|\ \ \ \ \ | | | | | | | | | | | | Add fopen method to ISimpleFile
| * | | | | Separate fopen into read and write methodsJulius Härtl2018-07-113-8/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Add fopen method to ISimpleFileJulius Härtl2018-07-113-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #10098 from nextcloud/feature/noid/ldap-image-attributeMorris Jobke2018-07-119-50/+221
|\ \ \ \ \ \ | |/ / / / / |/| | | | | allow admin to disable fetching of avatars as well as a specific attribute
| * | | | | adjust and add more unit testsArthur Schiwon2018-07-054-18/+96
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | allow admin to disable fetching of avatars as well as a specific attributeArthur Schiwon2018-07-057-33/+126
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypesMorris Jobke2018-07-113-7/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add comicbook mimetypes
| * | | | | | Add repair stepRoeland Jago Douma2018-07-102-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Give the various comic book file formats distinct mime types so that they ↵John Oyler2018-07-101-6/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | can be handled correctly by the preview functionality without file type checking at that point.
* | | | | | Merge pull request #10177 from ↵Morris Jobke2018-07-111-33/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/theming-load-with-custom-theme Load theming app css as well if legacy theme is enabled
| * | | | | | Load theming app css as well if legacy theme is enabledJulius Härtl2018-07-101-33/+27
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / / / / [tx-robot] updated from transifexNextcloud bot2018-07-1144-162/+364
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2018-07-10520-2474/+3152
| | | | |
* | | | | Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-jobMorris Jobke2018-07-097-3/+98
|\ \ \ \ \ | | | | | | | | | | | | Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
| * | | | | Suppress potential SQL injection warning as they are false positivesMorris Jobke2018-07-092-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Add repair job for pending cron jobsMorris Jobke2018-07-094-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Only wait for cron if fix for endless wait is includedMorris Jobke2018-07-092-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * see https://github.com/nextcloud/server/issues/9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Unlock failed cron jobs and set a high "last_checked" value to avoid ↵Morris Jobke2018-07-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continous re-check * fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored * fixed #9992 Signed-off-by: Morris Jobke <hey@morrisjobke.de>