summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exceptionRoeland Jago Douma2017-01-116-46/+179
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| * | | fix coding style and increase code coverageChristoph Wurst2017-01-113-61/+131
| * | | 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 #3007 from Loki3000/masterRoeland Jago Douma2017-01-113-4/+19
|\ \ \ | |/ / |/| |
| * | remove non required sql requestsLoki30002017-01-101-3/+8
| * | spaces addedLoki30002017-01-101-1/+1
| * | spaces addedLoki30002017-01-101-1/+1
| * | allowed '0' uidLoki30002017-01-101-1/+1
| * | allowed '0' uidLoki30002017-01-101-2/+2
| * | fix spacesLoki30002017-01-101-1/+1
| * | fix bracketsLoki30002017-01-101-2/+4
| * | remove non required db requestsLoki30002017-01-101-1/+6
| * | remove non required db requestsLoki30002017-01-101-1/+4
* | | 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