summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #2914 from nextcloud/logrotate-logfileMorris Jobke2017-01-102-2/+4
|\ \ \ \ \
| * | | | | Get the logfile location while running the logrotate cron job instead of when...Robin Appelman2017-01-062-2/+4
* | | | | | Merge pull request #3000 from nextcloud/cache-no-storeRoeland Jago Douma2017-01-104-5/+5
|\ \ \ \ \ \
| * | | | | | fix controller testChristoph Wurst2017-01-101-1/+1
| * | | | | | fix data response test expected cache headersChristoph Wurst2017-01-101-1/+1
| * | | | | | set 'no-store' cache header if we do not want FF to cacheChristoph Wurst2017-01-092-3/+3
* | | | | | | Merge pull request #2943 from nextcloud/kill_old_preview_codeMorris Jobke2017-01-108-2336/+24
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update autoloaderRoeland Jago Douma2017-01-042-2/+0
| * | | | | | Remove old preview codeRoeland Jago Douma2017-01-043-2329/+0
| * | | | | | Rewrite old preview endpoint for PreviewManagerRoeland Jago Douma2017-01-043-5/+24
* | | | | | | Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-links...Roeland Jago Douma2017-01-105-8/+171
|\ \ \ \ \ \ \
| * | | | | | | allow to access mail shares even if public links are disabledBjoern Schiessle2017-01-043-7/+61
| * | | | | | | also create mail share if public links are disabledBjoern Schiessle2017-01-042-1/+110
* | | | | | | | Merge pull request #3005 from nextcloud/dev-manual-12Roeland Jago Douma2017-01-102-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | fix dev manual linkChristoph Wurst2017-01-102-2/+2
* | | | | | | | Merge pull request #2982 from nextcloud/better-notification-linksMorris Jobke2017-01-107-74/+77
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix update notification testsJoas Schilling2017-01-093-45/+27
| * | | | | | | Cleanup comment testsJoas Schilling2017-01-092-13/+4
| * | | | | | | Only add the link when the user can follow it.Joas Schilling2017-01-091-3/+34
| * | | | | | | Set the link of the notification on render instead of creationJoas Schilling2017-01-092-9/+8
| * | | | | | | Set the comment link on render instead of creationJoas Schilling2017-01-092-6/+6
* | | | | | | | Merge pull request #2925 from nextcloud/remove-close-wrapperRoeland Jago Douma2017-01-1014-351/+137
|\ \ \ \ \ \ \ \
| * | | | | | | | update autoloaderRobin Appelman2017-01-062-2/+0
| * | | | | | | | replace close:// streamwrapper with CallBackWrapperRobin Appelman2017-01-0612-349/+137
* | | | | | | | | Merge pull request #2998 from Loki3000/masterMorris Jobke2017-01-101-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Default value for null userLoki30002017-01-091-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #2987 from nextcloud/no-empty-bundleLukas Reschke2017-01-093-8/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | dont write a certificate bundle if the shipped ca bundle is emptyRobin Appelman2017-01-093-8/+23
* | | | | | | | Merge pull request #2992 from nextcloud/fix_subdir_install_styleMorris Jobke2017-01-091-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix subdir install styleRoeland Jago Douma2017-01-091-3/+3
* | | | | | | | | Merge pull request #2985 from nextcloud/fix-trusted-domain-errorLukas Reschke2017-01-091-8/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow access to CSS resourcesLukas Reschke2017-01-091-8/+16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2814 from nextcloud/appstore_etag_validationJoas Schilling2017-01-094-11/+204
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add ETag validation to appstore requestsRoeland Jago Douma2017-01-054-11/+204
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-0960-416/+914
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2512 from nextcloud/cleanup-system-tag-usageRoeland Jago Douma2017-01-065-53/+103
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Adjust the JS unit testsJoas Schilling2016-12-061-16/+71
| * | | | | | | Only allow admins to delete tagsJoas Schilling2016-12-064-37/+32
* | | | | | | | Merge pull request #2930 from nextcloud/kill-group-restriction-when-not-appli...Roeland Jago Douma2017-01-063-0/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove group restrictions when those are not allowed anymoreJoas Schilling2017-01-043-0/+32
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #2948 from nextcloud/allow-global-composer-to-be-usedMorris Jobke2017-01-061-9/+19
|\ \ \ \ \ \ \
| * | | | | | | Allow to use a global composer instanceJoas Schilling2017-01-051-9/+19
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2934 from nextcloud/quota-stream-non-globalRoeland Jago Douma2017-01-063-79/+21
|\ \ \ \ \ \ \
| * | | | | | | remove the need to register the quota streamwrapper globallyRobin Appelman2017-01-043-79/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2968 from nextcloud/update-3rdpartyMorris Jobke2017-01-061-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update 3rdparty after the merge of #2050Morris Jobke2017-01-061-0/+0
* | | | | | | Merge pull request #2966 from nextcloud/ldif-mime-supportRoeland Jago Douma2017-01-062-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | recognize LDIF (and schema) file typesArthur Schiwon2017-01-062-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2050 from nextcloud/scss-switch-baseRoeland Jago Douma2017-01-0636-3196/+5519
|\ \ \ \ \ \
| * | | | | | Fix js testsRoeland Jago Douma2017-01-063-1/+7