summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24788 from owncloud/config-filesystem_check_changesVincent Petry2016-05-241-2/+3
|\
| * clarify filesystem_check_changes in config.sample.phpCarla Schroder2016-05-231-2/+3
* | Merge pull request #24787 from owncloud/fix-update-issue-on-masterVincent Petry2016-05-241-2/+7
|\ \
| * | Add the background jobs after the table was updatedJoas Schilling2016-05-231-2/+7
* | | Merge pull request #23395 from owncloud/mysql-check-speedupVincent Petry2016-05-241-0/+23
|\ \ \
| * | | Speedup schema cloning for MySQLVictor Dubiniuk2016-05-231-0/+23
* | | | Merge pull request #24750 from owncloud/lenz1111-share_download_range_request...Vincent Petry2016-05-235-15/+221
|\ \ \ \
| * | | | Code style and doc fixPiotr Filiciak2016-05-233-10/+11
| * | | | Http Range requests support in downloadsPiotr Filiciak2016-05-205-15/+220
* | | | | Merge pull request #24729 from owncloud/try-token-login-firstVincent Petry2016-05-231-5/+13
|\ \ \ \ \
| * | | | | try token login firstChristoph Wurst2016-05-201-5/+13
* | | | | | Merge pull request #24658 from owncloud/invalidate-disabled-user-sessionVincent Petry2016-05-232-3/+51
|\ \ \ \ \ \
| * | | | | | invalidate user session if the user is disabledChristoph Wurst2016-05-232-3/+51
* | | | | | | Merge pull request #24559 from owncloud/2faVincent Petry2016-05-2327-8/+1471
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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 #24777 from owncloud/scanner-dont-propagateVincent Petry2016-05-231-2/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | dont needlessly triger the propgator in the scannerRobin Appelman2016-05-231-2/+4
* | | | | | Merge pull request #24699 from owncloud/background-scan-recursionVincent Petry2016-05-233-3/+34
|\ \ \ \ \ \
| * | | | | | Only recurse into incomplete folders during background scansRobin Appelman2016-05-233-3/+34
* | | | | | | 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