Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move Travis tests to DroneCI | Lukas Reschke | 2016-09-13 | 4 | -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-support | Lukas Reschke | 2016-09-13 | 1 | -0/+11 |
|\ | | | | | Pass redirect_url through setup form | ||||
| * | Pass redirect_url through setup form | Simon Eisenmann | 2016-09-13 | 1 | -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-speed | Christoph Wurst | 2016-09-13 | 1 | -10/+4 |
|\ | | | | | clone depth of 1 and execute integration tests first | ||||
| * | clone depth of 1 and execute integration tests first | Morris Jobke | 2016-09-13 | 1 | -10/+4 |
| | | | | | | | | * specify git image | ||||
* | | Merge pull request #1386 from nextcloud/better-mentions | Morris Jobke | 2016-09-13 | 1 | -6/+3 |
|\ \ | | | | | | | Try to mention 3 people that will leave comments | ||||
| * | | add nextcloud-bot to userBlacklist | Morris Jobke | 2016-09-13 | 1 | -0/+1 |
| | | | |||||
| * | | Try to mention 3 people that will leave comments | Joas Schilling | 2016-09-13 | 1 | -6/+2 |
| |/ | |||||
* | | Merge pull request #1370 from nextcloud/dav-fixassemblystreamperf | Morris Jobke | 2016-09-13 | 2 | -11/+94 |
|\ \ | | | | | | | [uc] Improve chunk upload AssemblyStream performance | ||||
| * | | Improve chunk upload AssemblyStream performance | Vincent Petry | 2016-09-13 | 2 | -11/+94 |
| |/ | |||||
* | | Merge pull request #1378 from nextcloud/phpunit_db_fix | Morris Jobke | 2016-09-13 | 24 | -310/+352 |
|\ \ | | | | | | | Fix getMock phpunit warnings | ||||
| * | | Fix getMock UtilTest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+8 |
| | | | |||||
| * | | Fix getMock UsersControllerTest | Roeland Jago Douma | 2016-09-13 | 1 | -13/+16 |
| | | | |||||
| * | | Fix getMock User | Roeland Jago Douma | 2016-09-13 | 4 | -136/+146 |
| | | | |||||
| * | | Fix getMock UrlGeneratortest | Roeland Jago Douma | 2016-09-13 | 1 | -10/+12 |
| | | | |||||
| * | | Fix getMock TagTest | Roeland Jago Douma | 2016-09-13 | 1 | -3/+4 |
| | | | |||||
| * | | Fix getMock ManagerTest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix getMock CertificateMangerTest | Roeland Jago Douma | 2016-09-13 | 1 | -2/+3 |
| | | | |||||
| * | | Fix getMock RepairUnmergedSharesTest | Roeland Jago Douma | 2016-09-13 | 1 | -4/+5 |
| | | | |||||
| * | | Fix getMock DBLockingProviderTest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+2 |
| | | | |||||
| * | | Fix getMock HelperStorageTest | Roeland Jago Douma | 2016-09-13 | 1 | -6/+5 |
| | | | |||||
| * | | Fix getMock ViewTest | Roeland Jago Douma | 2016-09-13 | 1 | -6/+7 |
| | | | |||||
| * | | Fix getMock scannertest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+2 |
| | | | |||||
| * | | Fix getMock QuotaTest | Roeland Jago Douma | 2016-09-13 | 1 | -9/+9 |
| | | | |||||
| * | | Fix getMock FolderTests | Roeland Jago Douma | 2016-09-13 | 1 | -96/+104 |
| | | | |||||
| * | | Fix getMock UserMountcacheTest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix getMock Cache | Roeland Jago Douma | 2016-09-13 | 1 | -1/+5 |
| | | | |||||
| * | | Fix getMock DecryptAllTest | Roeland Jago Douma | 2016-09-13 | 1 | -1/+2 |
| | | | |||||
| * | | Fix getMock ManagerTest | Roeland Jago Douma | 2016-09-13 | 1 | -4/+5 |
| | | | |||||
| * | | Fix getMock FileCacheTest | Roeland Jago Douma | 2016-09-13 | 1 | -5/+5 |
| | | | |||||
| * | | Fix getMock JobListTest | Roeland Jago Douma | 2016-09-13 | 1 | -2/+4 |
| | | | |||||
| * | | Fix getMock AppTests | Roeland Jago Douma | 2016-09-13 | 1 | -7/+6 |
| |/ | |||||
* | | Merge pull request #1376 from nextcloud/upstream-25966 | Morris Jobke | 2016-09-13 | 2 | -2/+104 |
|\ \ | |/ |/| | Allow increasing permissions for share owner | ||||
| * | Fix tests | Roeland Jago Douma | 2016-09-13 | 1 | -23/+17 |
| | | |||||
| * | Allow increasing permissions for share owner | Vincent Petry | 2016-09-13 | 2 | -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 transifex | Nextcloud bot | 2016-09-13 | 14 | -0/+66 |
| | |||||
* | Merge pull request #1380 from nextcloud/update-to-drone-0.5 | Morris Jobke | 2016-09-13 | 1 | -11/+67 |
|\ | | | | | Update drone.yml to 0.5 | ||||
| * | update drone.yml to 0.5 | Morris Jobke | 2016-09-13 | 1 | -11/+67 |
|/ | |||||
* | Merge pull request #1372 from nextcloud/upstream-26039 | Lukas Reschke | 2016-09-13 | 2 | -22/+22 |
|\ | | | | | Fix failing preview unit tests | ||||
| * | Fix failing preview unit tests (#26039) | Thomas Müller | 2016-09-12 | 2 | -22/+22 |
| | | |||||
* | | Merge pull request #1374 from nextcloud/upstream-26061 | Roeland Jago Douma | 2016-09-12 | 1 | -2/+10 |
|\ \ | | | | | | | Choose button remains disbaled for httpd/unix-directory | ||||
| * | | Choose button remains disbaled for httpd/unix-directory | Sujith Haridasan | 2016-09-12 | 1 | -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-codesniffer | Christoph Wurst | 2016-09-12 | 19 | -38/+23 |
|\ \ | |/ |/| | Fix codesniffer complains on some apps | ||||
| * | Fix some more sniffs | Joas Schilling | 2016-09-12 | 3 | -3/+0 |
| | | |||||
| * | Fix encryption app | Joas Schilling | 2016-09-12 | 2 | -2/+1 |
| | | |||||
| * | Fix twofactor_backupcodes | Joas Schilling | 2016-09-12 | 3 | -7/+5 |
| | | |||||
| * | Fix more sniffing | Joas Schilling | 2016-09-12 | 4 | -6/+5 |
| | | |||||
| * | Fix the User_LDAP app | Joas Schilling | 2016-09-12 | 7 | -17/+12 |
| | | |||||
| * | Fix sniffes in admin_audit | Joas Schilling | 2016-09-12 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #1373 from nextcloud/upstream-26091 | Joas Schilling | 2016-09-12 | 2 | -41/+7 |
|\ | | | | | Clean up code coverage |