summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22690 from owncloud/fix-comments-href-remote.php-filesVincent Petry2016-05-232-4/+5
|\
| * ensure comments-href returns a value also when propfind is done against remot...Arthur Schiwon2016-05-202-4/+5
* | Merge pull request #24695 from owncloud/background-scan-propagateVincent Petry2016-05-231-1/+13
|\ \
| * | Trigger propagation from the background scannerRobin Appelman2016-05-181-1/+13
* | | Merge pull request #24765 from owncloud/boolean-installed-configVincent Petry2016-05-232-2/+3
|\ \ \
| * | | Make sure we evaluate installed like we do it everywhereJoas Schilling2016-05-231-2/+2
| * | | Make sure that installed is a booleanJoas Schilling2016-05-231-0/+1
* | | | Merge pull request #24613 from owncloud/chunked-convert-database-queriesVincent Petry2016-05-231-14/+56
|\ \ \ \
| * | | | Chunk the "db:convert-type" select queries, to not run out of memory so fastJoas Schilling2016-05-131-14/+56
* | | | | Merge pull request #24703 from owncloud/personal-settings-auth-tokensVincent Petry2016-05-2319-10/+826
|\ \ \ \ \
| * | | | | add button to invalidate browser sessions/device tokensChristoph Wurst2016-05-2313-33/+236
| * | | | | add button to add new device tokensChristoph Wurst2016-05-238-24/+259
| * | | | | list user's auth tokens on the personal settings pageChristoph Wurst2016-05-2313-6/+384
| | |/ / / | |/| | |
* | | | | Merge pull request #24349 from owncloud/nfd-storagewrapperVincent Petry2016-05-237-15/+771
|\ \ \ \ \
| * | | | | Remove unneeded unsets in encoding wrapperVincent Petry2016-05-201-16/+3
| * | | | | Fixes for encoding wrapperVincent Petry2016-05-204-44/+72
| * | | | | Scanner must normalize new children names for cache diffVincent Petry2016-05-201-1/+1
| * | | | | Add encoding wrapper as opt-in mount optionVincent Petry2016-05-204-16/+26
| * | | | | Add wrapper for NFD encoding workaroundVincent Petry2016-05-204-1/+732
* | | | | | Merge pull request #24766 from owncloud/mmccarn-patch-2Vincent Petry2016-05-231-10/+13
|\ \ \ \ \ \
| * | | | | | Update imagePath to prefer theme, then app, then core imagesmmccarn2016-05-231-10/+13
| | |/ / / / | |/| | | |
* | | | | | 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
|\ \ \ \ \ \ \