summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Updating license headers"Morris Jobke2015-02-26793-14657/+7383
* Merge pull request #14502 from owncloud/failing-mysql-master-testsThomas Müller2015-02-266-6/+17
|\
| * Sort the array to be sureJoas Schilling2015-02-261-1/+8
| * Reset the group backend aswellJoas Schilling2015-02-251-1/+7
| * Clear the local cache when we clear the backendsJoas Schilling2015-02-251-0/+1
| * Extend the class so the Filesystem is cleaned upJoas Schilling2015-02-253-4/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-26194-596/+352
* | Merge pull request #14468 from owncloud/af-db-cleanupThomas Müller2015-02-2510-73/+262
|\ \
| * | remove IDb interface from core class usageBernhard Posselt2015-02-253-5/+5
| * | owncloud -> ownCloudThomas Müller2015-02-252-3/+3
| * | deprecate getters for deprecated classBernhard Posselt2015-02-252-2/+3
| * | fix tabs and spacesBernhard Posselt2015-02-251-119/+119
| * | fix mappertestutilityBernhard Posselt2015-02-251-116/+120
| * | use IDBConnection and close cursors after insert/update/deleteBernhard Posselt2015-02-253-53/+58
| * | migrate to IDBConnectionBernhard Posselt2015-02-253-12/+191
|/ /
* | Merge pull request #14494 from owncloud/fix-oracle-masterLukas Reschke2015-02-251-41/+33
|\ \
| * | using Doctrine\DBAL\Connection::executeUpdate()Thomas Müller2015-02-251-41/+33
| |/
* | Merge pull request #14509 from owncloud/fix/14231Lukas Reschke2015-02-251-1/+7
|\ \
| * | Show 404 page when accessing empty share URLLukas Reschke2015-02-251-1/+7
* | | Merge pull request #14508 from owncloud/tagmanager-nouserVincent Petry2015-02-252-0/+15
|\ \ \
| * | | Return null when requesting tags for null userVincent Petry2015-02-252-0/+15
| |/ /
* | | Merge pull request #14490 from owncloud/remove-unused-deprecated-codeClark Tomlinson2015-02-251-10/+0
|\ \ \
| * | | Remove unused and deprecated CodeLukas Reschke2015-02-251-10/+0
| | |/ | |/|
* | | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-253-7/+7
|\ \ \ | |_|/ |/| |
| * | Typo: Missing "n"cmeh2015-02-241-1/+1
| * | Cleaning-up messagescmeh2015-02-181-3/+3
| * | Update setupchecks.jscmeh2015-02-161-1/+1
| * | Message clean-upcmeh2015-02-161-3/+3
* | | Merge pull request #14500 from owncloud/fileglobalgc-cleanupThomas Müller2015-02-253-28/+119
|\ \ \
| * | | Cleanup garbage collection for global file cacheRobin Appelman2015-02-253-28/+119
| | |/ | |/|
* | | Merge pull request #10735 from owncloud/use_remote_addrRobin McCorkell2015-02-252-5/+2
|\ \ \ | |/ / |/| |
| * | Use getRemoteAddress which supports reverse proxiesLukas Reschke2015-02-242-5/+2
* | | Merge pull request #14462 from owncloud/add-some-php-docsThomas Müller2015-02-251-2/+70
|\ \ \
| * | | Add some PHPDocsLukas Reschke2015-02-241-2/+70
* | | | Merge pull request #14460 from owncloud/revive/12971Thomas Müller2015-02-251-3/+15
|\ \ \ \
| * | | | Fix code style as per reviewLukas Reschke2015-02-241-2/+2
| * | | | Add support for sftp custom portSA2015-02-241-3/+15
| |/ / /
* | | | Merge pull request #14458 from owncloud/revive/11157Thomas Müller2015-02-252-3/+30
|\ \ \ \
| * | | | Use [0] instead of current as HHVM might have problems with thatLukas Reschke2015-02-241-1/+1
| * | | | Get the real protocol behind several proxiesLukas Reschke2015-02-242-3/+30
| |/ / /
* | | | Merge pull request #14475 from owncloud/fix-ext-owncloudRobin McCorkell2015-02-252-2/+10
|\ \ \ \
| * | | | Fix bugs in ownCloud external storageRobin McCorkell2015-02-252-2/+10
* | | | | Merge pull request #13741 from owncloud/autotest_improvementsThomas Müller2015-02-254-24/+32
|\ \ \ \ \
| * | | | | Better cleanup in autotest.shRobin McCorkell2015-01-284-24/+32
* | | | | | Merge pull request #14151 from owncloud/update-sabre2.1Thomas Müller2015-02-2540-1780/+1556
|\ \ \ \ \ \
| * | | | | | Remove locks plugin.Thomas Müller2015-02-253-175/+0
| * | | | | | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-02-232-1/+45
| * | | | | | Removed broken webdav testsVincent Petry2015-02-231-272/+0
| * | | | | | Sabre Update to 2.1Vincent Petry2015-02-2339-1355/+1534
* | | | | | | Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-s...Vincent Petry2015-02-253-12/+115
|\ \ \ \ \ \ \