summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-09-1524-110/+450
|
* Merge pull request #1405 from nextcloud/update_moment_jsRoeland Jago Douma2016-09-145-2392/+4905
|\ | | | | update moment.js to 2.15
| * update moment.js to 2.15Georg Ehrke2016-09-145-2392/+4905
| |
* | Merge pull request #1375 from ↵Lukas Reschke2016-09-142-5/+11
|\ \ | | | | | | | | | | | | nextcloud/display-that-updating-failed-for-htaccess Display an error when updating .htaccess failed
| * | Update docsJoas Schilling2016-09-131-1/+2
| | |
| * | Display an error when updating .htaccess failedJoas Schilling2016-09-132-4/+9
| |/
* | Merge pull request #1401 from nextcloud/rename-file-to-copyingMorris Jobke2016-09-142-3/+3
|\ \ | | | | | | Rename COPYING-AGPL to COPYING
| * | Rename COPYING-AGPL to COPYINGLukas Reschke2016-09-132-3/+3
| | | | | | | | | | | | That way GitHub properly indexes the license information and displays it inline. Also renamed one old usage of "ownCloud" to Nextcloud.
* | | [tx-robot] updated from transifexNextcloud bot2016-09-1420-4/+114
|/ /
* | Merge pull request #1395 from nextcloud/issue-369-htaccess-max-sizesMorris Jobke2016-09-135-14/+14
|\ \ | | | | | | Make sure memory limit is > post size and upload filesize
| * | Make sure memory limit is > post size and upload filesizeJoas Schilling2016-09-135-14/+14
| |/
* | Merge pull request #1348 from karakayasemi/patch-1Roeland Jago Douma2016-09-131-1/+1
|\ \ | | | | | | Bug fix CachedMountInfo for user home storage
| * | Update CachedMountInfo for user home storageSemih Serhat Karakaya2016-09-091-1/+1
| | | | | | | | | | | | | | | | | | In getMountPointNode function rootId is not inside of the userFolder for home storage. We was searching '/user' folder in '/user/files' folder. So, it was return NULL. I moved searching part to parent folder. It solves everything. Also, obviously other storage types not affect then this change. Related owncloud commit : https://github.com/owncloud/core/pull/26017
* | | Merge pull request #1400 from nextcloud/fix-mysql-raceconditionRoeland Jago Douma2016-09-132-9/+5
|\ \ \ | | | | | | | | add actual check if mysql is up already
| * | | add actual check if mysql is up alreadyMorris Jobke2016-09-132-9/+5
|/ / /
* | | Merge pull request #1338 from nextcloud/fix-trashbin-errorsRoeland Jago Douma2016-09-135-0/+37
|\ \ \ | | | | | | | | Opening the trashbin causes errors in log for files without preview
| * | | Opening the trashbin causes errors in log for files without previewMorris Jobke2016-09-095-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * put a file without a generated preview in the trashbin (e.g. a *.docx file) * open the trashbin * following errors will show up in the nextcloud.log: - filesize(): stat failed for ... - fopen(...): failed to open stream: No such file or directory at ... - fread() expects parameter 1 to be resource, boolean given at ... - fclose() expects parameter 1 to be resource, boolean given at ... - imagecreatefromstring(): Empty string or invalid image at ... This is because the preview code tries to load an SVG image, which is obviously only text. The fix simply handles this before the loading happens and the web UI keeps showing the default mimetype icon.
* | | | Merge pull request #1396 from nextcloud/fix-phpunit-4.8Roeland Jago Douma2016-09-133-6/+24
|\ \ \ \ | | | | | | | | | | Make tests work with 4.8 at least
| * | | | Make tests work with 4.8 at leastJoas Schilling2016-09-133-6/+24
| | |_|/ | |/| |
* | | | Merge pull request #1399 from nextcloud/use-tests-to-drone-from-travisRoeland Jago Douma2016-09-134-81/+75
|\ \ \ \ | | | | | | | | | | Move Travis tests to DroneCI
| * | | | 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
| | | | |