Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Return null when requesting tags for null user | Vincent Petry | 2015-02-25 | 2 | -0/+15 |
* | Merge pull request #14500 from owncloud/fileglobalgc-cleanup | Thomas Müller | 2015-02-25 | 3 | -28/+119 |
|\ | |||||
| * | Cleanup garbage collection for global file cache | Robin Appelman | 2015-02-25 | 3 | -28/+119 |
* | | Merge pull request #10735 from owncloud/use_remote_addr | Robin McCorkell | 2015-02-25 | 2 | -5/+2 |
|\ \ | |/ |/| | |||||
| * | Use getRemoteAddress which supports reverse proxies | Lukas Reschke | 2015-02-24 | 2 | -5/+2 |
* | | Merge pull request #14462 from owncloud/add-some-php-docs | Thomas Müller | 2015-02-25 | 1 | -2/+70 |
|\ \ | |||||
| * | | Add some PHPDocs | Lukas Reschke | 2015-02-24 | 1 | -2/+70 |
* | | | Merge pull request #14460 from owncloud/revive/12971 | Thomas Müller | 2015-02-25 | 1 | -3/+15 |
|\ \ \ | |||||
| * | | | Fix code style as per review | Lukas Reschke | 2015-02-24 | 1 | -2/+2 |
| * | | | Add support for sftp custom port | SA | 2015-02-24 | 1 | -3/+15 |
| |/ / | |||||
* | | | Merge pull request #14458 from owncloud/revive/11157 | Thomas Müller | 2015-02-25 | 2 | -3/+30 |
|\ \ \ | |||||
| * | | | Use [0] instead of current as HHVM might have problems with that | Lukas Reschke | 2015-02-24 | 1 | -1/+1 |
| * | | | Get the real protocol behind several proxies | Lukas Reschke | 2015-02-24 | 2 | -3/+30 |
| |/ / | |||||
* | | | Merge pull request #14475 from owncloud/fix-ext-owncloud | Robin McCorkell | 2015-02-25 | 2 | -2/+10 |
|\ \ \ | |||||
| * | | | Fix bugs in ownCloud external storage | Robin McCorkell | 2015-02-25 | 2 | -2/+10 |
* | | | | Merge pull request #13741 from owncloud/autotest_improvements | Thomas Müller | 2015-02-25 | 4 | -24/+32 |
|\ \ \ \ | |||||
| * | | | | Better cleanup in autotest.sh | Robin McCorkell | 2015-01-28 | 4 | -24/+32 |
* | | | | | Merge pull request #14151 from owncloud/update-sabre2.1 | Thomas Müller | 2015-02-25 | 40 | -1780/+1556 |
|\ \ \ \ \ | |||||
| * | | | | | Remove locks plugin. | Thomas Müller | 2015-02-25 | 3 | -175/+0 |
| * | | | | | Show a empty response for GET on non-files instead of the Browser Plugin | Lukas Reschke | 2015-02-23 | 2 | -1/+45 |
| * | | | | | Removed broken webdav tests | Vincent Petry | 2015-02-23 | 1 | -272/+0 |
| * | | | | | Sabre Update to 2.1 | Vincent Petry | 2015-02-23 | 39 | -1355/+1534 |
* | | | | | | Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-s... | Vincent Petry | 2015-02-25 | 3 | -12/+115 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add PHPunit test for DefaultCollator | AW-UC | 2015-02-24 | 1 | -9/+95 |
| * | | | | | | Fix sorting for files that only differ in case. | AW-UC | 2015-02-24 | 1 | -5/+8 |
| * | | | | | | Add constructor to inject collator | AW-UC | 2015-02-20 | 1 | -0/+13 |
| * | | | | | | provide case-insensitive natural sorting | AW-UC | 2015-02-18 | 1 | -4/+5 |
* | | | | | | | Merge pull request #14471 from owncloud/always-load-authentication-apps | Thomas Müller | 2015-02-24 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Always load authentication apps | Lukas Reschke | 2015-02-24 | 1 | -3/+4 |
| | |_|_|/ / / | |/| | | | | | |||||
* / | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-25 | 222 | -320/+176 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #14068 from owncloud/autotest-external-sftp | Thomas Müller | 2015-02-24 | 3 | -4/+105 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [files_external] sftp tests | Morris Jobke | 2015-02-10 | 3 | -4/+105 |
* | | | | | | | Merge pull request #13740 from owncloud/fix-12190-2 | Lukas Reschke | 2015-02-24 | 5 | -26/+85 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | and escape the search term | Arthur Schiwon | 2015-01-29 | 3 | -1/+5 |
| * | | | | | | | :lipstick: | Arthur Schiwon | 2015-01-28 | 1 | -4/+4 |
| * | | | | | | | fix counting of users in primary group | Arthur Schiwon | 2015-01-28 | 2 | -24/+69 |
| * | | | | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190 | Arthur Schiwon | 2015-01-28 | 1 | -2/+12 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #14400 from owncloud/fix-cron-deadlock | Lukas Reschke | 2015-02-24 | 2 | -46/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use flock instead of just checking if there is a file to prevent deadlocks wh... | Bernhard Posselt | 2015-02-24 | 2 | -46/+41 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #14195 from owncloud/activity-manager-performance-improvem... | Lukas Reschke | 2015-02-24 | 4 | -107/+151 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix test with the invalid filter check being added | Joas Schilling | 2015-02-13 | 1 | -43/+45 |
| * | | | | | | | Order methods to by grouped by their task | Joas Schilling | 2015-02-13 | 3 | -74/+74 |
| * | | | | | | | Check whether filter is valid, before doing stuff for it | Joas Schilling | 2015-02-13 | 1 | -1/+12 |
| * | | | | | | | Cache some values from the extensions | Joas Schilling | 2015-02-13 | 1 | -0/+31 |
* | | | | | | | | Merge pull request #14282 from owncloud/disable-non-shipped-apps-master | Thomas Müller | 2015-02-24 | 7 | -85/+115 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | print app upgrade information to console as well | Thomas Müller | 2015-02-24 | 1 | -0/+6 |
| * | | | | | | | | 3rd-party apps are only disabled in case core is upgraded | Thomas Müller | 2015-02-24 | 1 | -0/+14 |
| * | | | | | | | | shipped and 3rd-party apps of type authentication and session will remain ena... | Thomas Müller | 2015-02-24 | 1 | -3/+11 |
| * | | | | | | | | 3rd-party apps are disabled on upgrade - refs #14026 | Thomas Müller | 2015-02-24 | 7 | -85/+87 |
* | | | | | | | | | Merge pull request #14461 from owncloud/fix-code-that-never-worked | Thomas Müller | 2015-02-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ |