summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-14166-132/+244
* Merge pull request #12639 from owncloud/bad_mtime_formatMorris Jobke2014-12-133-4/+30
|\
| * Return ? if mtime is 0 or -1Robin McCorkell2014-12-123-4/+30
* | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-137-50/+71
|\ \
| * | Replace input checkbox CSS selector with .electCheckBoxVincent Petry2014-12-112-22/+18
| * | Move file thumbnail into the label elementVincent Petry2014-12-117-29/+54
* | | Merge pull request #12726 from owncloud/add-filter-for-backend-to-rest-indexMorris Jobke2014-12-136-24/+157
|\ \ \
| * | | Make comment clearLukas Reschke2014-12-121-1/+1
| * | | Comment code pathLukas Reschke2014-12-121-0/+1
| * | | Use limit and offsetLukas Reschke2014-12-121-1/+1
| * | | Use array key instead of valueLukas Reschke2014-12-122-4/+15
| * | | Add test for user without backendLukas Reschke2014-12-121-0/+16
| * | | Use public interfaceLukas Reschke2014-12-112-6/+6
| * | | Break loopLukas Reschke2014-12-111-0/+1
| * | | Add filter for 'backend' to user REST routeLukas Reschke2014-12-106-17/+121
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1352-124/+120
* | | | Merge pull request #12806 from owncloud/display-backend-in-usermgntVincent Petry2014-12-126-24/+59
|\ \ \ \
| * | | | Show user backend in user managementMorris Jobke2014-12-126-24/+59
* | | | | Merge pull request #12778 from owncloud/searchbytags2Vincent Petry2014-12-1217-53/+375
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added searchByTag in cache jail wrapperVincent Petry2014-12-121-0/+12
| * | | | Make $userId mandatory for searchByTagsVincent Petry2014-12-1210-32/+73
| * | | | Added searchByTags to view, storage and cacheVincent Petry2014-12-1110-0/+230
| * | | | Add user parameter to tag managerVincent Petry2014-12-114-38/+56
| * | | | Add login/logout to TestCase base classVincent Petry2014-12-101-0/+21
* | | | | Merge pull request #12812 from owncloud/remove-53-workaroundThomas Müller2014-12-121-6/+1
|\ \ \ \ \
| * | | | | Remove conditional check for 5.3 compatibilityLukas Reschke2014-12-121-6/+1
* | | | | | Merge pull request #12808 from owncloud/add-special-parameterlist-to-managerJoas Schilling2014-12-125-3/+93
|\ \ \ \ \ \
| * | | | | | Specify list of activity parameters for sharing extensionJoas Schilling2014-12-121-3/+34
| * | | | | | Add test for getSpecialParameterList()Joas Schilling2014-12-111-0/+20
| * | | | | | Allow extensions to specify the list of special parametersJoas Schilling2014-12-113-0/+39
* | | | | | | Merge pull request #12789 from owncloud/external-iconVincent Petry2014-12-121-210/+2
|\ \ \ \ \ \ \
| * | | | | | | fix and compress files_external iconJan-Christoph Borchardt2014-12-111-210/+2
* | | | | | | | Merge pull request #12587 from owncloud/dav-logerrorsVincent Petry2014-12-121-3/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Log exceptions in DAV storageVincent Petry2014-12-031-3/+29
* | | | | | | | | Merge pull request #12807 from owncloud/fix-timespan-languageJoas Schilling2014-12-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Correctly inject the language into the subcallJoas Schilling2014-12-121-1/+1
* | | | | | | | | | Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-1212-66/+172
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Remove obsoleted filelist prototype backup in testsVincent Petry2014-12-043-24/+3
| * | | | | | | | | Simple Plugin system for JavascriptVincent Petry2014-12-0111-42/+169
* | | | | | | | | | Merge pull request #12790 from owncloud/user-mngt-js-onlyMorris Jobke2014-12-124-112/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add comments to user list JS for better understandingMorris Jobke2014-12-121-0/+26
| * | | | | | | | | | move loading of JS and CSS to templateMorris Jobke2014-12-122-8/+13
| * | | | | | | | | | remove PHP generated user list and move all to the existing JS partMorris Jobke2014-12-123-104/+31
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #12805 from Gadzy/patch-1Morris Jobke2014-12-121-9/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check for share by link enabledGadzy2014-12-121-9/+12
|/ / / / / / / / / /
* | | / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2014-12-1214-10/+36
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_filesMorris Jobke2014-12-126-40/+99
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | show readonly message in file conflict dialog, make it always selectedJörn Friedrich Dreyer2014-12-115-38/+97
| * | | | | | | | | return correct resultJörn Friedrich Dreyer2014-12-081-2/+2
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-12272-252/+372