summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-01-172-0/+10
* [tx-robot] updated from transifexNextcloud bot2017-01-164-12/+12
* Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c...Joas Schilling2017-01-131-0/+12
|\
| * Change the row-format before changing the collationJoas Schilling2017-01-121-0/+12
* | Merge pull request #2918 from nextcloud/encryption-recovery-improvementsMorris Jobke2017-01-132-0/+45
|\ \ | |/ |/|
| * create new encryption keys on password reset and backup the old oneBjoern Schiessle2017-01-102-0/+45
* | [tx-robot] updated from transifexNextcloud bot2017-01-114-6/+14
* | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exceptionRoeland Jago Douma2017-01-113-0/+40
|\ \
| * | Update autoloaderRoeland Jago Douma2017-01-112-0/+2
| * | fix coding style and increase code coverageChristoph Wurst2017-01-111-12/+13
| * | Update TwoFactorException.phpCornelius Kölbel2017-01-111-2/+2
| * | Add a TwoFactorExceptionCornelius Kölbel2017-01-111-0/+37
* | | 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 #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-111-5/+16
|\ \ \ \
| * | | | Only check for local shared storagesRoeland Jago Douma2017-01-101-2/+3
| * | | | Skip local shares in bkg scan and occ files:scan (#26590)Vincent Petry2017-01-101-5/+15
| | |_|/ | |/| |
* | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefullyRoeland Jago Douma2017-01-112-8/+25
|\ \ \ \ | |/ / / |/| | |
| * | | Better fallback for unknown log typesJoas Schilling2017-01-101-9/+10
| * | | Add testsJoas Schilling2017-01-091-1/+1
| * | | Handle log_type "nextcloud" more gracefullyJoas Schilling2017-01-052-8/+24
| |/ /
* | | 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-101-2/+2
|\ \ \ \
| * | | | set 'no-store' cache header if we do not want FF to cacheChristoph Wurst2017-01-091-2/+2
* | | | | Merge pull request #2943 from nextcloud/kill_old_preview_codeMorris Jobke2017-01-107-1373/+24
|\ \ \ \ \
| * | | | | Update autoloaderRoeland Jago Douma2017-01-042-2/+0
| * | | | | Remove old preview codeRoeland Jago Douma2017-01-042-1366/+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-101-1/+0
|\ \ \ \ \ \
| * | | | | | also create mail share if public links are disabledBjoern Schiessle2017-01-041-1/+0
* | | | | | | Merge pull request #2925 from nextcloud/remove-close-wrapperRoeland Jago Douma2017-01-108-168/+32
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | update autoloaderRobin Appelman2017-01-062-2/+0
| * | | | | | replace close:// streamwrapper with CallBackWrapperRobin Appelman2017-01-066-166/+32
* | | | | | | Default value for null userLoki30002017-01-091-0/+1
* | | | | | | Merge pull request #2987 from nextcloud/no-empty-bundleLukas Reschke2017-01-092-5/+19
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | dont write a certificate bundle if the shipped ca bundle is emptyRobin Appelman2017-01-092-5/+19
* | | | | | | 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
|\ \ \ \ \ \ \