| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-21 | 12 | -2/+16 |
| | | |||||
| * | Merge pull request #2790 from nextcloud/update-integration-test-image | Morris Jobke | 2016-12-20 | 1 | -20/+20 |
| |\ | | | | | Update integration test image | ||||
| | * | Update integration test image | Lukas Reschke | 2016-12-20 | 1 | -20/+20 |
| | | | | | | | | | | | | | Updates the composer dependencies so running the tests should now be faster again… Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2273 from nextcloud/fix_invalid_calendar | Lukas Reschke | 2016-12-20 | 5 | -0/+452 |
| |\ \ | | | | | | | Add DAV repair step to fix calendar data | ||||
| | * | | Add DAV repair step to fix calendar data | Roeland Jago Douma | 2016-11-24 | 5 | -0/+452 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #2789 from nextcloud/add-smb-tests | Lukas Reschke | 2016-12-20 | 9 | -264/+115 |
| |\ \ \ | |_|/ |/| | | Add SMB tests execution and execute files_external tests | ||||
| | * | | Run coverage | Lukas Reschke | 2016-12-20 | 1 | -2/+12 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Add SMB tests and execute files_external tests | Lukas Reschke | 2016-12-20 | 9 | -264/+105 |
| |/ / | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Merge pull request #2719 from nextcloud/behat-transferownership | Lukas Reschke | 2016-12-20 | 7 | -21/+414 |
| |\ \ | | | | | | | [downstream] Behat transferownership | ||||
| | * | | Fix finding transferred folder in integration tests | Vincent Petry | 2016-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Adjust to Nextcloud changes | Lukas Reschke | 2016-12-19 | 2 | -13/+41 |
| | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | Add transfer ownership integration tests (#26543) | Vincent Petry | 2016-12-19 | 6 | -40/+405 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add transfer ownership integration tests * Added more transfer ownership tests and OCC checks Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #2769 from nextcloud/improve_user_user_coverage | Morris Jobke | 2016-12-20 | 1 | -49/+204 |
| |\ \ \ | | | | | | | | | Improve OC\User\User coverage | ||||
| | * | | | Improve OC\User\User coverage | Roeland Jago Douma | 2016-12-20 | 1 | -49/+204 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #2765 from nextcloud/kill-repairlegacystorages | Christoph Wurst | 2016-12-20 | 5 | -582/+0 |
| |\ \ \ \ | | | | | | | | | | | [downstream] Remove obsolete RepairLegacyStorages repair step | ||||
| | * | | | | Update autoloader files | Lukas Reschke | 2016-12-19 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | | Remove obsolete RepairLegacyStorages repair step | Vincent Petry | 2016-12-19 | 3 | -580/+0 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-12-20 | 204 | -404/+1578 |
| | | | | | |||||
| * | | | | Merge pull request #2774 from nextcloud/fix-2585 | Lukas Reschke | 2016-12-20 | 1 | -5/+0 |
| |\ \ \ \ | | | | | | | | | | | remove frequent, unimportant log message | ||||
| | * | | | | remove frequent, unimportant log message | Arthur Schiwon | 2016-12-19 | 1 | -5/+0 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Fixes #2585 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort | Christoph Wurst | 2016-12-19 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [downstream] When grouping shares, sort by stime then id (#26777) | ||||
| | * | | | | When grouping shares, sort by stime then id (#26777) | Vincent Petry | 2016-12-19 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | If share times are equal, the first share should still win instead of having the shares swapped. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2762 from nextcloud/add-js-computerFileSize | Lukas Reschke | 2016-12-19 | 2 | -0/+76 |
| |\ \ \ \ | |/ / / |/| | | | [downstream] Add js computer file size | ||||
| | * | | | Verify input, add more unit tests | Patrick Paysant | 2016-12-19 | 2 | -12/+23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | Add test for unparseable string | Patrick Paysant | 2016-12-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | Implements all comments from @PVince81 | Patrick Paysant | 2016-12-19 | 2 | -48/+46 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | Adding computerFileSize in OC.Util | Patrick Paysant | 2016-12-19 | 2 | -0/+66 |
| |/ / / | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | Merge pull request #2757 from nextcloud/cron-5.6 | Lukas Reschke | 2016-12-19 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | Also check in cron for old php version | ||||
| | * | | | Also check in cron for old php version | Roeland Jago Douma | 2016-12-19 | 1 | -0/+7 |
| | |/ / | | | | | | | | | | | | | | | | Fixes #2756 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #2752 from ↵ | Lukas Reschke | 2016-12-19 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | nextcloud/issue-2675-dont-allow-firefox-to-store-the-space Use a form so firefox doesn't try to save the space as a password | ||||
| | * | | | Use a form so firefox doesn't try to save the space as a password | Joas Schilling | 2016-12-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | Merge pull request #2754 from nextcloud/activities-manager-publish-exception | Robin Appelman | 2016-12-19 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Activities IManager throws an BadMethodCallException | ||||
| | * | | | | Activities IManager throws an BadMethodCallException | Christoph Wurst | 2016-12-19 | 1 | -0/+1 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | Merge pull request #2689 from andreas-p/fix-remote-conflict | Lukas Reschke | 2016-12-19 | 1 | -1/+12 |
| |\ \ \ \ | |/ / / |/| | | | Fix showConflict | ||||
| | * | | | Fix showConflict | pflug | 2016-12-19 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use getFullFileName to show conflicting file add original.directory to make fileExists happy Signed-off-by: Andreas Pflug <dev@admin4.org> | ||||
| * | | | | Merge pull request #2727 from nextcloud/fix-colon-issue | Roeland Jago Douma | 2016-12-19 | 3 | -0/+25 |
| |\ \ \ \ | |_|/ / |/| | | | [downstream] Fix colon issue | ||||
| | * | | | Update third-party ref for new sabre/uri version | Lukas Reschke | 2016-12-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| | * | | | Add integration test for creating folder with colon | Vincent Petry | 2016-12-16 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2721 from nextcloud/ocs-die-on-exception | Roeland Jago Douma | 2016-12-19 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | [downstream] Die in OCS v1.php on exception | ||||
| | * | | | | Die in OCS v1.php on exception | Vincent Petry | 2016-12-16 | 1 | -1/+3 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2723 from nextcloud/integrity-exit-code | Roeland Jago Douma | 2016-12-19 | 2 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | [downstream] Return 1 if integrity check is failed. Fixes #22806 | ||||
| | * | | | | Return 1 if integrity check is failed. Fixes #22806 | Victor Dubiniuk | 2016-12-16 | 2 | -0/+6 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2726 from nextcloud/check-all-channels | Christoph Wurst | 2016-12-18 | 1 | -7/+3 |
| |\ \ \ \ | | | | | | | | | | | [downstream] Consider all channel except blank and git to be signed | ||||
| | * | | | | Consider all channel except blank and git to be signed | Victor Dubiniuk | 2016-12-16 | 1 | -7/+3 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2735 from nextcloud/fix-settingsmenu | Christoph Wurst | 2016-12-18 | 1 | -4/+3 |
| |\ \ \ \ | | | | | | | | | | | Adjust shadows and fix positioning in header menus | ||||
| | * | | | | Adjust shadows and fix positioning | Julius Haertl | 2016-12-17 | 1 | -4/+3 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
| * | | | | Merge pull request #2725 from nextcloud/memcached-connect-once | Roeland Jago Douma | 2016-12-17 | 1 | -10/+11 |
| |\ \ \ \ | | | | | | | | | | | [downstream] Set options, then add servers | ||||
| | * | | | | Set options, then add servers | Victor Dubiniuk | 2016-12-16 | 1 | -10/+11 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | | | Merge pull request #2722 from nextcloud/failed-to-create-share-fix | Roeland Jago Douma | 2016-12-17 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | [downstream] commit transaction after select query | ||||
| | * | | | | commit transaction after select query | phisch | 2016-12-16 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |