summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add OCC command to enable/disable 2FA for a userChristoph Wurst2016-05-236-3/+169
* Add two factor auth to coreChristoph Wurst2016-05-2324-8/+1305
* Merge pull request #24726 from owncloud/tests-psr-4Vincent Petry2016-05-2336-42/+55
|\
| * Move tests/settings to PSR-4Joas Schilling2016-05-1910-21/+32
| * Move tests/core/ to PSR-4Joas Schilling2016-05-1926-21/+23
* | Merge pull request #24514 from owncloud/federation-psr4Vincent Petry2016-05-2323-11/+21
|\ \
| * | Fix errors in the testsJoas Schilling2016-05-195-10/+20
| * | Move federation tests to PSR-4Joas Schilling2016-05-1910-4/+4
| * | Move federation code to PSR-4Joas Schilling2016-05-1913-1/+1
| |/
* | Merge pull request #24603 from owncloud/federated_reshareVincent Petry2016-05-2329-468/+1604
|\ \
| * | remove reshares and the mapping in the federated_reshares table on unshare fr...Björn Schießle2016-05-201-1/+34
| * | add missung return valueBjörn Schießle2016-05-201-3/+4
| * | improved error messagesBjörn Schießle2016-05-203-21/+27
| * | move motifier from the files_sharing app to the federatedfilessharing appBjörn Schießle2016-05-203-13/+18
| * | fall back to old re-sharing behaviour in case the remote server doesn't suppo...Björn Schießle2016-05-202-35/+70
| * | update share permissionsBjörn Schießle2016-05-204-13/+57
| * | use share initiator as fall back to access the fileBjörn Schießle2016-05-2012-24/+111
| * | close cursor after select to avoid db lockBjörn Schießle2016-05-201-0/+1
| * | create re-share by owner and propagate unshare and unshare-from self requestBjörn Schießle2016-05-2015-125/+815
| * | use query builder for getShare and add testsBjörn Schießle2016-05-203-11/+100
| * | move request handler for federated shares to the federated sharing appBjörn Schießle2016-05-204-11/+156
* | | Merge pull request #24356 from owncloud/scanner-recursion-memoryVincent Petry2016-05-231-22/+25
|\ \ \
| * | | Free up folder content from memory before recursing in the file scannerRobin Appelman2016-04-291-22/+25
* | | | Merge pull request #22620 from owncloud/comments-apiVincent Petry2016-05-239-75/+165
|\ \ \ \
| * | | | Move EntityEvent to PSR-4Joas Schilling2016-05-231-0/+0
| * | | | Fix unit testsJoas Schilling2016-05-233-30/+37
| * | | | Make the root collection neutral so it does not only work for filesJoas Schilling2016-05-235-30/+123
| * | | | Remove unused UserFolderJoas Schilling2016-05-232-15/+5
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-2338-8/+70
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-22130-212/+174
* | | | Merge pull request #24732 from owncloud/autoloader_fixVincent Petry2016-05-214-22/+2
|\ \ \ \
| * | | | Move Template to PSR-4Roeland Jago Douma2016-05-201-0/+0
| * | | | Fix unit testsRoeland Jago Douma2016-05-201-15/+1
| * | | | Only allow loading of legacy (lib/private/legacy) by defaultRoeland Jago Douma2016-05-201-5/+1
| * | | | \OCP is handled by composer autoloaderRoeland Jago Douma2016-05-201-2/+0
| | |/ / | |/| |
* | | | Merge pull request #24696 from owncloud/lock-jobs-while-executingVincent Petry2016-05-2113-140/+257
|\ \ \ \
| * | | | Do not lock the cron anymore so we can have multiple workersJoas Schilling2016-05-212-38/+0
| * | | | Lock jobs while executing them, to allow multiple executors to run in parallelJoas Schilling2016-05-217-101/+148
| * | | | Add a method to lock a tableJoas Schilling2016-05-216-2/+110
| |/ / /
* | | | Merge pull request #24307 from owncloud/systemtags-perminterfaceVincent Petry2016-05-2130-414/+1305
|\ \ \ \
| * | | | Increase version for DB additionVincent Petry2016-05-201-1/+1
| * | | | Make it possible to exclude admin groups from groups select2Vincent Petry2016-05-201-5/+10
| * | | | Some tweaks for systemtagmanagerVincent Petry2016-05-203-67/+2
| * | | | Rename "not-assignble" to "restricted"Vincent Petry2016-05-204-4/+4
| * | | | Add app to shipped.jsonVincent Petry2016-05-201-0/+1
| * | | | Update integration tests for system tags with groupsVincent Petry2016-05-203-17/+232
| * | | | Adjust DAV SystemTagPlugin unit tests for groupsVincent Petry2016-05-202-79/+244
| * | | | Fix system tags DAV plugin testsVincent Petry2016-05-201-50/+20
| * | | | Fix system tag update codeVincent Petry2016-05-201-0/+4
| * | | | Add admin-only system tag groups propertyVincent Petry2016-05-201-4/+39