summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix testsCornelius Kölbel2017-01-111-2/+5
* Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
* Add a TwoFactorExceptionCornelius Kölbel2017-01-113-5/+63
* Merge pull request #3020 from nextcloud/2944Roeland Jago Douma2017-01-111-1/+1
|\
| * Update mobile.cssRodrigo Almeida2017-01-111-1/+1
|/
* Merge pull request #2744 from nextcloud/oc_26324Roeland Jago Douma2017-01-111-52/+53
|\
| * Fix DAV stat cache to properly cache 404Vincent Petry2017-01-051-52/+53
* | Merge pull request #2745 from nextcloud/oc_26590Roeland Jago Douma2017-01-112-5/+37
|\ \
| * | Only check for local shared storagesRoeland Jago Douma2017-01-102-4/+6
| * | Skip local shares in bkg scan and occ files:scan (#26590)Vincent Petry2017-01-102-5/+35
* | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefullyRoeland Jago Douma2017-01-113-8/+43
|\ \ \
| * | | Better fallback for unknown log typesJoas Schilling2017-01-102-11/+14
| * | | Add testsJoas Schilling2017-01-092-1/+17
| * | | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-052-8/+24
| | |/ | |/|
* | | Merge pull request #3012 from nextcloud/fix-karma-image-warningsRoeland Jago Douma2017-01-101-2/+3
|\ \ \ | |_|/ |/| |
| * | show fewer warnings in karma test runsChristoph Wurst2017-01-101-2/+3
* | | Merge pull request #3009 from nextcloud/fix-calendar-todo-event-typeMorris Jobke2017-01-103-5/+5
|\ \ \
| * | | Make sure the used event type and the setting/filter are the sameJoas Schilling2017-01-103-5/+5
* | | | 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
| | |_|_|/ / / / / | |/| | | | | | |