summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* switch to using watch to implement cas and cad on redisRobin Appelman2015-06-121-30/+22
* clear memcache keys in lockingRobin Appelman2015-06-121-1/+2
* add compare-and-delete to the memcache interfaceRobin Appelman2015-06-128-0/+87
* compare-and-set and compare-and-delete using lua scripts for redisRobin Appelman2015-06-121-2/+50
* Merge pull request #16886 from owncloud/webdav-verify-path-againVincent Petry2015-06-122-6/+60
|\
| * tests for getNodeForPath with invalid pathRobin Appelman2015-06-111-6/+56
| * verify path when getting a node for sabredavRobin Appelman2015-06-111-0/+4
* | Merge pull request #16888 from owncloud/feature/fix-titlesJan-Christoph Borchardt2015-06-121-2/+11
|\ \
| * | fixing setting page titlesClark Tomlinson2015-06-111-2/+11
| |/
* | Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-k...Vincent Petry2015-06-122-17/+135
|\ \
| * | Don't use limit on explode to have only 1 code pathJoas Schilling2015-06-121-7/+2
| * | Add return value to lock methods and check it in testsJoas Schilling2015-06-122-13/+92
| * | Only lock files in data/username/files/Joas Schilling2015-06-121-9/+53
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-06-1210-8/+126
|/
* Merge pull request #16883 from owncloud/revert-16880-webdav-verify-pathVincent Petry2015-06-111-2/+0
|\
| * Revert "verify path when getting a node for sabredav"Vincent Petry2015-06-111-2/+0
|/
* Merge pull request #16880 from owncloud/webdav-verify-pathVincent Petry2015-06-111-0/+2
|\
| * verify path when getting a node for sabredavRobin Appelman2015-06-111-0/+2
* | Merge pull request #16879 from jcfischer/jcf_fix_user_delete_messageLukas Reschke2015-06-112-2/+2
|\ \ | |/ |/|
| * Fix test message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
| * Fix error message and add 'user' to itJens-Christian Fischer2015-06-111-1/+1
* | Merge pull request #16872 from owncloud/missing-nullcache-importLukas Reschke2015-06-112-6/+169
|\ \ | |/ |/|
| * Check the query() for all defined servicesJoas Schilling2015-06-111-1/+112
| * Order all use statements correctlyJoas Schilling2015-06-111-6/+6
| * Correctly import NullCache classJoas Schilling2015-06-112-0/+52
|/
* Merge pull request #16869 from owncloud/php7Morris Jobke2015-06-113-6/+4
|\
| * Null -> NullCacheThomas Müller2015-06-113-6/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1118-18/+96
|/
* Revert "Null -> NullCache"Thomas Müller2015-06-112-2/+4
* Null -> NullCacheThomas Müller2015-06-112-4/+2
* Merge pull request #16860 from owncloud/fix-appmenuMorris Jobke2015-06-101-2/+2
|\
| * fix app menu not showing on mobile, fix #16844Jan-Christoph Borchardt2015-06-101-2/+2
* | Merge pull request #16814 from owncloud/improve-repairMorris Jobke2015-06-101-6/+7
|\ \
| * | Fix fetching the mimetype id from the queryJoas Schilling2015-06-091-1/+2
| * | Reduce amount of rows to updateVictor Dubiniuk2015-06-091-6/+6
* | | Merge pull request #16736 from owncloud/utilize-member-ofThomas Müller2015-06-105-35/+110
|\ \ \
| * | | if possible, getUserGroups should get memberships using memberOf virtual attr...Arthur Schiwon2015-06-034-2/+96
| * | | Implement a faster way for checking availability of memberOf. Users tab in th...Arthur Schiwon2015-06-031-33/+14
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-1014-10/+182
* | | | Merge pull request #16810 from owncloud/disable-search-if-not-implementedThomas Müller2015-06-092-12/+25
|\ \ \ \
| * | | | Bring back filtering on apps management pageThomas Müller2015-06-091-1/+3
| * | | | Search results have to explicitly be added to the content area of the appThomas Müller2015-06-092-8/+6
| * | | | Disable search field in case there is no search available to the current sele...Thomas Müller2015-06-081-4/+17
* | | | | Merge pull request #16840 from owncloud/fix-video-previewLukas Reschke2015-06-093-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Disable video preview if previews are disabledMorris Jobke2015-06-093-1/+3
|/ / / /
* | | | Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-e...Thomas Müller2015-06-092-14/+57
|\ \ \ \
| * | | | Add a test for the fallback to the part file keysJoas Schilling2015-06-081-13/+46
| * | | | Check if the part files has keys when the original file does notJoas Schilling2015-06-081-1/+11
* | | | | Merge pull request #16818 from owncloud/upgrade-jquery-migrateMorris Jobke2015-06-098-516/+545
|\ \ \ \ \
| * | | | | Upgrade jquery-migrate to 1.2.1Morris Jobke2015-06-098-516/+545