summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move Travis tests to DroneCILukas Reschke2016-09-134-81/+75
| | | | | | | | | | Should give us some quicker test execution speed as we're not limited by Travis Explicitly invoke with "bash" Install instance already Use newest litmus container
* Merge pull request #1393 from longsleep/redirect_url-on-setup-supportLukas Reschke2016-09-131-0/+11
|\ | | | | Pass redirect_url through setup form
| * Pass redirect_url through setup formSimon Eisenmann2016-09-131-0/+11
|/ | | | | | | | | | | When accessing a 'not set up' Nextcloud with a redirect_url parameter the parameter will is added to the setup POST request, resulting in the requested redirect after setup is complete. This is required in scenarios where Nextcloud is used as authorization provider like on the Spreedbox to allow redirection to the required page when normally a login form would be shown but the setup form is shown instead.
* Merge pull request #1383 from nextcloud/improve-ci-speedChristoph Wurst2016-09-131-10/+4
|\ | | | | clone depth of 1 and execute integration tests first
| * clone depth of 1 and execute integration tests firstMorris Jobke2016-09-131-10/+4
| | | | | | | | * specify git image
* | Merge pull request #1386 from nextcloud/better-mentionsMorris Jobke2016-09-131-6/+3
|\ \ | | | | | | Try to mention 3 people that will leave comments
| * | add nextcloud-bot to userBlacklistMorris Jobke2016-09-131-0/+1
| | |
| * | Try to mention 3 people that will leave commentsJoas Schilling2016-09-131-6/+2
| |/
* | Merge pull request #1370 from nextcloud/dav-fixassemblystreamperfMorris Jobke2016-09-132-11/+94
|\ \ | | | | | | [uc] Improve chunk upload AssemblyStream performance
| * | Improve chunk upload AssemblyStream performanceVincent Petry2016-09-132-11/+94
| |/
* | Merge pull request #1378 from nextcloud/phpunit_db_fixMorris Jobke2016-09-1324-310/+352
|\ \ | | | | | | Fix getMock phpunit warnings
| * | Fix getMock UtilTestRoeland Jago Douma2016-09-131-1/+8
| | |
| * | Fix getMock UsersControllerTestRoeland Jago Douma2016-09-131-13/+16
| | |
| * | Fix getMock UserRoeland Jago Douma2016-09-134-136/+146
| | |
| * | Fix getMock UrlGeneratortestRoeland Jago Douma2016-09-131-10/+12
| | |
| * | Fix getMock TagTestRoeland Jago Douma2016-09-131-3/+4
| | |
| * | Fix getMock ManagerTestRoeland Jago Douma2016-09-131-1/+1
| | |
| * | Fix getMock CertificateMangerTestRoeland Jago Douma2016-09-131-2/+3
| | |
| * | Fix getMock RepairUnmergedSharesTestRoeland Jago Douma2016-09-131-4/+5
| | |
| * | Fix getMock DBLockingProviderTestRoeland Jago Douma2016-09-131-1/+2
| | |
| * | Fix getMock HelperStorageTestRoeland Jago Douma2016-09-131-6/+5
| | |
| * | Fix getMock ViewTestRoeland Jago Douma2016-09-131-6/+7
| | |
| * | Fix getMock scannertestRoeland Jago Douma2016-09-131-1/+2
| | |
| * | Fix getMock QuotaTestRoeland Jago Douma2016-09-131-9/+9
| | |
| * | Fix getMock FolderTestsRoeland Jago Douma2016-09-131-96/+104
| | |
| * | Fix getMock UserMountcacheTestRoeland Jago Douma2016-09-131-1/+1
| | |
| * | Fix getMock CacheRoeland Jago Douma2016-09-131-1/+5
| | |
| * | Fix getMock DecryptAllTestRoeland Jago Douma2016-09-131-1/+2
| | |
| * | Fix getMock ManagerTestRoeland Jago Douma2016-09-131-4/+5
| | |
| * | Fix getMock FileCacheTestRoeland Jago Douma2016-09-131-5/+5
| | |
| * | Fix getMock JobListTestRoeland Jago Douma2016-09-131-2/+4
| | |
| * | Fix getMock AppTestsRoeland Jago Douma2016-09-131-7/+6
| |/
* | Merge pull request #1376 from nextcloud/upstream-25966Morris Jobke2016-09-132-2/+104
|\ \ | |/ |/| Allow increasing permissions for share owner
| * Fix testsRoeland Jago Douma2016-09-131-23/+17
| |
| * Allow increasing permissions for share ownerVincent Petry2016-09-132-1/+109
|/ | | | | | In some cases, the owner of the share is also recipient through a group share. The owner must still be able to increase permissions in that situation.
* [tx-robot] updated from transifexNextcloud bot2016-09-1314-0/+66
|
* Merge pull request #1380 from nextcloud/update-to-drone-0.5Morris Jobke2016-09-131-11/+67
|\ | | | | Update drone.yml to 0.5
| * update drone.yml to 0.5Morris Jobke2016-09-131-11/+67
|/
* Merge pull request #1372 from nextcloud/upstream-26039Lukas Reschke2016-09-132-22/+22
|\ | | | | Fix failing preview unit tests
| * Fix failing preview unit tests (#26039)Thomas Müller2016-09-122-22/+22
| |
* | Merge pull request #1374 from nextcloud/upstream-26061Roeland Jago Douma2016-09-121-2/+10
|\ \ | | | | | | Choose button remains disbaled for httpd/unix-directory
| * | Choose button remains disbaled for httpd/unix-directorySujith Haridasan2016-09-121-2/+10
| |/ | | | | | | | | | | | | | | | | | | This is not correct. Hence in this patch we validate if the mimetype is 'httpd/unix-directory'. If so we don't disable it. This patch addresses solution for issue: 26034 Signed-off-by: Sujith Haridasan <Sujith_Haridasan@mentor.com>
* | Merge pull request #1368 from nextcloud/use-codesnifferChristoph Wurst2016-09-1219-38/+23
|\ \ | |/ |/| Fix codesniffer complains on some apps
| * Fix some more sniffsJoas Schilling2016-09-123-3/+0
| |
| * Fix encryption appJoas Schilling2016-09-122-2/+1
| |
| * Fix twofactor_backupcodesJoas Schilling2016-09-123-7/+5
| |
| * Fix more sniffingJoas Schilling2016-09-124-6/+5
| |
| * Fix the User_LDAP appJoas Schilling2016-09-127-17/+12
| |
| * Fix sniffes in admin_auditJoas Schilling2016-09-121-3/+0
|/
* Merge pull request #1373 from nextcloud/upstream-26091Joas Schilling2016-09-122-41/+7
|\ | | | | Clean up code coverage