summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \
| * | | | | | | Add PHPunit test for DefaultCollatorAW-UC2015-02-241-9/+95
| * | | | | | | Fix sorting for files that only differ in case.AW-UC2015-02-241-5/+8
| * | | | | | | Add constructor to inject collatorAW-UC2015-02-201-0/+13
| * | | | | | | provide case-insensitive natural sortingAW-UC2015-02-181-4/+5
* | | | | | | | Merge pull request #14471 from owncloud/always-load-authentication-appsThomas Müller2015-02-241-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Always load authentication appsLukas Reschke2015-02-241-3/+4
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-25222-320/+176
|/ / / / / / /
* | | | | | | Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ \ \ \ \ \ \
| * | | | | | | [files_external] sftp testsMorris Jobke2015-02-103-4/+105
* | | | | | | | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | and escape the search termArthur Schiwon2015-01-293-1/+5
| * | | | | | | | :lipstick:Arthur Schiwon2015-01-281-4/+4
| * | | | | | | | fix counting of users in primary groupArthur Schiwon2015-01-282-24/+69
| * | | | | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-01-281-2/+12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #14400 from owncloud/fix-cron-deadlockLukas Reschke2015-02-242-46/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | use flock instead of just checking if there is a file to prevent deadlocks wh...Bernhard Posselt2015-02-242-46/+41
|/ / / / / / / /
* | | | | | | | Merge pull request #14195 from owncloud/activity-manager-performance-improvem...Lukas Reschke2015-02-244-107/+151
|\ \ \ \ \ \ \ \