summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-1452-94/+662
* [tx-robot] updated from transifexNextcloud bot2017-05-1328-2/+126
* Merge pull request #4816 from nextcloud/Ardinis-quota-files_externalMorris Jobke2017-05-122-4/+4
|\
| * fix quota tests for external storageMorris Jobke2017-05-121-3/+3
| * Correctly calculate used space for quota with external storageArdinis2017-05-121-1/+1
* | Merge pull request #4829 from nextcloud/theming-preview-clickMorris Jobke2017-05-122-0/+13
|\ \
| * | Don't open the dialog for logo and backgroundJoas Schilling2017-05-121-1/+2
| * | Clicking on theming preview triggers fileupload dialogMorris Jobke2017-05-112-0/+12
| |/
* | Merge pull request #4809 from nextcloud/downstream-27676Lukas Reschke2017-05-125-16/+29
|\ \
| * | Disable the API endpoints as wellJoas Schilling2017-05-113-16/+26
| * | Disable reset password link. Issue: #27440Ujjwal Bhardwaj2017-05-112-0/+3
* | | Merge pull request #4825 from nextcloud/add-timeout-appstoreLukas Reschke2017-05-122-2/+8
|\ \ \
| * | | Fix failed assertionsJoas Schilling2017-05-121-1/+5
| * | | Add timeout for requests to appstoreMorris Jobke2017-05-111-1/+3
| | |/ | |/|
* | | Merge pull request #4822 from nextcloud/fix-input-sizeLukas Reschke2017-05-121-1/+1
|\ \ \
| * | | Fix size of enforced expiry date inputMorris Jobke2017-05-111-1/+1
| |/ /
* | | Merge pull request #4824 from nextcloud/log-connection-problems-appfetcherLukas Reschke2017-05-126-8/+36
|\ \ \
| * | | Fix unit testsJoas Schilling2017-05-123-2/+12
| * | | Log connectiong problems while fetching data from appstoreMorris Jobke2017-05-113-6/+24
| |/ /
* | | Merge pull request #4826 from nextcloud/hide-cropper-inputJoas Schilling2017-05-121-0/+4
|\ \ \
| * | | Hide checkbox in avatarcropperMorris Jobke2017-05-111-0/+4
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-05-1288-1682/+526
* | | Merge pull request #4821 from nextcloud/update-redis-cluster-documentationMorris Jobke2017-05-111-2/+10
|\ \ \ | |/ / |/| |
| * | Update redis cluster documentationMorris Jobke2017-05-111-2/+10
* | | Merge pull request #4817 from nextcloud/more-app-update-logsLukas Reschke2017-05-113-2/+25
|\ \ \ | |/ / |/| |
| * | Proper logging for appstore updatesMorris Jobke2017-05-113-2/+25
|/ /
* | Merge pull request #4804 from nextcloud/proper-upgrade-sizeLukas Reschke2017-05-112-2/+24
|\ \
| * | Properly decide on actual users if instance is too bigMorris Jobke2017-05-102-2/+24
* | | Merge pull request #4808 from nextcloud/downstream-27788Morris Jobke2017-05-111-8/+8
|\ \ \
| * | | More fixesJoas Schilling2017-05-111-1/+1
| * | | Adjust sample documentationJoas Schilling2017-05-111-7/+7
| | |/ | |/|
* | | Merge pull request #4800 from nextcloud/remove-unused-config.php-optionMorris Jobke2017-05-111-5/+0
|\ \ \
| * | | SSL menu is now shown for files_externalMorris Jobke2017-05-101-5/+0
| | |/ | |/|
* | | Merge pull request #4803 from nextcloud/postgres-sleepMorris Jobke2017-05-111-0/+2
|\ \ \ | |_|/ |/| |
| * | Add 10 seconds sleep time after postgres startupMorris Jobke2017-05-101-0/+2
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-05-1168-8/+274
* | Merge pull request #4783 from nextcloud/lite-application-classesMorris Jobke2017-05-1019-128/+87
|\ \
| * | Automatic injection into the FetchersJoas Schilling2017-05-109-55/+32
| * | Automatic creation of Identity managerJoas Schilling2017-05-104-14/+19
| * | Use automatic DI injection for UpdateLookupServerJoas Schilling2017-05-102-29/+9
| * | Automatic injection for CssControllerJoas Schilling2017-05-103-17/+14
| * | Automatic injection for JsControllerJoas Schilling2017-05-103-13/+13
* | | Merge pull request #4798 from nextcloud/multibucket-root-fsMorris Jobke2017-05-102-2/+47
|\ \ \ | |_|/ |/| |
| * | Use distributed cache for SCSS dependencies as wellMorris Jobke2017-05-101-1/+1
| * | Setup root FS for multibucket object storageMorris Jobke2017-05-101-1/+46
|/ /
* | Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fnMorris Jobke2017-05-101-0/+7
|\ \
| * | Eval script elemtents in HTML body responseLukas Reschke2017-05-101-0/+7
* | | Merge pull request #4787 from nextcloud/missing-parameterRoeland Jago Douma2017-05-101-1/+1
|\ \ \
| * | | Fix missing placeholder for doc linkJoas Schilling2017-05-101-1/+1
| | |/ | |/|
* | | Merge pull request #4788 from nextcloud/issue-4756-cron-errorLukas Reschke2017-05-101-5/+23
|\ \ \