summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3649 from nextcloud/bugfix/saving-backup-codes-data-uriRoeland Jago Douma2017-02-281-41/+121
|\
| * Fix saving backup codes by using a correct data uriChristoph Wurst2017-02-281-41/+121
* | Merge pull request #3650 from nextcloud/bugfix/tokenprovider-asserted-method-...Roeland Jago Douma2017-02-281-2/+2
|\ \
| * | DefaultTokenProviderTest mocked/asserted the wrong methodChristoph Wurst2017-02-281-2/+2
| |/
* | Merge pull request #3651 from nextcloud/refactor/provisioning-usercontroller-...Morris Jobke2017-02-281-76/+67
|\ \
| * | Refactor provision api app's UserControllerTestChristoph Wurst2017-02-281-76/+67
| |/
* | Merge pull request #3643 from nextcloud/replace-deprecated-tipsyLukas Reschke2017-02-284-11/+11
|\ \ | |/ |/|
| * fix typoMorris Jobke2017-02-281-1/+1
| * Replace deprecated $.tipsy(...) by $.tooltip(...)Christoph Wurst2017-02-274-11/+11
* | Merge pull request #2997 from nextcloud/fix_2957Morris Jobke2017-02-284-34/+48
|\ \
| * | Properly handle groups with a /Roeland Jago Douma2017-02-274-34/+48
| |/
* | Merge pull request #3635 from individual-it/fix_quota_validationMorris Jobke2017-02-283-13/+35
|\ \
| * | make values with white spaces possibleArtur Neumann2017-02-282-1/+8
| * | better quota validationArtur Neumann2017-02-283-12/+27
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2814-14/+152
| |/ |/|
* | Merge pull request #3618 from nextcloud/fix-install-page-warningRoeland Jago Douma2017-02-271-5/+0
|\ \
| * | Remove not needed rule for .warningMorris Jobke2017-02-241-5/+0
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2722-26/+40
* | | Merge pull request #3623 from nextcloud/daita-patch-1Morris Jobke2017-02-261-1/+1
|\ \ \
| * | | Fix conditionMaxence Lange2017-02-261-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-2612-0/+12
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-02-2540-26/+260
* | | Merge pull request #3489 from nextcloud/give-hint-about-opcacheMorris Jobke2017-02-244-1/+99
|\ \ \ | |/ / |/| |
| * | Show info in admin settings about PHP opcache if disabledMorris Jobke2017-02-224-1/+99
* | | Merge pull request #3588 from GreenArchon/issue_#3461Lukas Reschke2017-02-242-36/+18
|\ \ \
| * | | Refactor files' CacheEntry object creation to call cacheEntryFromData() all t...Frédéric Fortier2017-02-221-36/+16
| * | | Typecast filecache 'storage' as int to return it as documented, fixes #3461Frédéric Fortier2017-02-202-1/+3
* | | | Merge pull request #3598 from nextcloud/issue-3583-shared-addressbooks-fail-o...Roeland Jago Douma2017-02-241-1/+1
|\ \ \ \
| * | | | Use the correct principal for shared addressbooksJoas Schilling2017-02-231-1/+1
* | | | | Merge pull request #3612 from KB7777/patch-1Roeland Jago Douma2017-02-241-1/+1
|\ \ \ \ \
| * | | | | Update Setup.phpKB77772017-02-241-1/+1
|/ / / / /
* | | | | Merge pull request #3287 from nextcloud/readd_appstoreenabled_switchJoas Schilling2017-02-244-8/+193
|\ \ \ \ \
| * | | | | Fix unit tests and improve appstore logicMorris Jobke2017-02-244-9/+178
| * | | | | Add back appstoreenabled config switchSteffen Lindner2017-02-241-4/+20
* | | | | | Merge pull request #3603 from nextcloud/update-iconJoas Schilling2017-02-241-1/+4
|\ \ \ \ \ \
| * | | | | | Bring back checkmark icon on successful updateMorris Jobke2017-02-241-1/+4
* | | | | | | Merge pull request #3605 from nextcloud/single-userJoas Schilling2017-02-2416-310/+37
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Clean up single user modeMorris Jobke2017-02-2216-310/+37
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-2484-142/+760
* | | | | | Merge pull request #3589 from nextcloud/remove-unneeded-repair-stepMorris Jobke2017-02-2329-3284/+19
|\ \ \ \ \ \
| * | | | | | cleanup old and not needed repair steps to speed up the updateMorris Jobke2017-02-2228-3192/+19
| * | | | | | Remove unneeded UpdateCertificateStore.Morris Jobke2017-02-223-92/+0
| |/ / / / /
* | | | | | Merge pull request #3576 from robert-scheck/timezoneMorris Jobke2017-02-231-5/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | According to issue #3553, the default logtimezone is always UTCRobert Scheck2017-02-231-5/+0
* | | | | | Merge pull request #2602 from nextcloud/resize-the-controls-after-the-sidebar...Lukas Reschke2017-02-231-1/+1
|\ \ \ \ \ \
| * | | | | | Increase debounce time to make sure controls are resized after the sidebar di...Marius Blüm2017-01-231-1/+1
* | | | | | | Merge pull request #3590 from individual-it/correct_text_when_disabling_appLukas Reschke2017-02-231-1/+2
|\ \ \ \ \ \ \
| * | | | | | | show correct text when disabling App Artur Neumann2017-02-231-1/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #3575 from nextcloud/better-thumbnail-qualityJoas Schilling2017-02-232-16/+49
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix code quality a bitJoas Schilling2017-02-221-13/+17