summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow notifiers to know whether we are preparing push notificationsJoas Schilling2018-07-132-0/+32
* [tx-robot] updated from transifexNextcloud bot2018-07-1216-12/+54
* Merge pull request #10206 from nextcloud/bugfix/noid/fix-unit-testsMorris Jobke2018-07-111-32/+15
|\
| * Fix unit tests - follow up to #10197Morris Jobke2018-07-111-32/+15
* | Merge pull request #10204 from nextcloud/fix/noid/strict_csp_evalMorris Jobke2018-07-111-1/+1
|\ \ | |/ |/|
| * Disallow eval on the StrictEvalCSPRoeland Jago Douma2018-07-111-1/+1
* | Merge pull request #9895 from nextcloud/fed-group-sharesMorris Jobke2018-07-1136-228/+935
|\ \
| * | fix unit testsBjoern Schiessle2018-07-112-1/+4
| * | add some integration testsBjoern Schiessle2018-07-112-0/+121
| * | fix js testsBjoern Schiessle2018-07-111-24/+82
| * | update unit testsBjoern Schiessle2018-07-117-40/+120
| * | update autoloaderBjoern Schiessle2018-07-112-0/+2
| * | start to get fed group shares into the share dialogBjoern Schiessle2018-07-116-5/+120
| * | handle unshare request from ownerBjoern Schiessle2018-07-111-18/+25
| * | unshare from selfBjoern Schiessle2018-07-111-10/+15
| * | accept/decline group sharesBjoern Schiessle2018-07-114-15/+98
| * | fix notification when a group share is receivedBjoern Schiessle2018-07-111-9/+15
| * | translate nextcloud share types to OCM share typesBjoern Schiessle2018-07-111-1/+5
| * | log error messgageBjoern Schiessle2018-07-111-0/+1
| * | implement federated group sharesBjoern Schiessle2018-07-1114-113/+274
| * | add setting to enable/disable federated group sharingBjoern Schiessle2018-07-113-2/+63
* | | 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.9Roeland Jago Douma2018-07-111-0/+0
* | | Merge pull request #9942 from nextcloud/feature/2338/invitation_response_in_e...Roeland Jago Douma2018-07-1117-10/+1345
|\ \ \
| * | | Bump version of app else migrations don't runRoeland Jago Douma2018-06-291-1/+1
| * | | Include accept / decline links in CalDAV invitation emailsGeorg Ehrke2018-06-2917-9/+1344
* | | | Merge pull request #10197 from nextcloud/feature/9410/improve-opcache-feedbackRoeland Jago Douma2018-07-114-11/+103
|\ \ \ \
| * | | | Fix detection if opcache extension is loadedMorris Jobke2018-07-111-1/+1
| * | | | Fix testsMorris Jobke2018-07-112-1/+11
| * | | | opcache module checkCthulhux2018-07-113-11/+93
* | | | | Merge pull request #10199 from nextcloud/bugfix/noid/improve-url-detection-in...Morris Jobke2018-07-112-9/+58
|\ \ \ \ \
| * | | | | Improve url detection in commentsJoas Schilling2018-07-112-9/+58
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10179 from nextcloud/mount-filterMorris Jobke2018-07-112-1/+30
|\ \ \ \ \
| * | | | | Add the option to filter mounts for a userRobin Appelman2018-07-102-1/+30
| |/ / / /
* | | | | Merge pull request #10025 from nextcloud/smb-rename-invalidargument-retryMorris Jobke2018-07-111-3/+17
|\ \ \ \ \
| * | | | | also retry rename operation on InvalidArgumentExceptionRobin Appelman2018-06-271-3/+17
* | | | | | Merge pull request #10193 from nextcloud/bugfix/10175/sanitize-parameterMorris Jobke2018-07-111-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Sanitize parameters in createSessionToken() while loggingMorris Jobke2018-07-111-0/+1
|/ / / / /
* | | | | Merge pull request #10122 from nextcloud/feature/noid/appdata-fopen-streamMorris Jobke2018-07-113-0/+57
|\ \ \ \ \
| * | | | | Separate fopen into read and write methodsJulius Härtl2018-07-113-8/+37
| * | | | | Add fopen method to ISimpleFileJulius Härtl2018-07-113-0/+28
* | | | | | Merge pull request #10098 from nextcloud/feature/noid/ldap-image-attributeMorris Jobke2018-07-119-50/+221
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | adjust and add more unit testsArthur Schiwon2018-07-054-18/+96
| * | | | | allow admin to disable fetching of avatars as well as a specific attributeArthur Schiwon2018-07-057-33/+126
* | | | | | Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypesMorris Jobke2018-07-113-7/+24
|\ \ \ \ \ \
| * | | | | | Add repair stepRoeland Jago Douma2018-07-102-1/+18
| * | | | | | Give the various comic book file formats distinct mime types so that they can...John Oyler2018-07-101-6/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #10177 from nextcloud/bugfix/noid/theming-load-with-custom...Morris Jobke2018-07-111-33/+27
|\ \ \ \ \ \
| * | | | | | Load theming app css as well if legacy theme is enabledJulius Härtl2018-07-101-33/+27
| |/ / / / /
* / / / / / [tx-robot] updated from transifexNextcloud bot2018-07-1144-162/+364
|/ / / / /