summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-292-0/+2
* Merge pull request #20811 from owncloud/fix-php-doc-for-externalRobin McCorkell2015-11-281-4/+5
|\
| * Fix some PHPDocsLukas Reschke2015-11-281-4/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-2812-6/+70
* Merge pull request #20799 from owncloud/scrutinizer-patch-1Thomas Müller2015-11-288-30/+60
|\
| * Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-278-30/+60
* | Merge pull request #20789 from owncloud/scanner-skip-not-availableRobin Appelman2015-11-275-10/+29
|\ \ | |/ |/|
| * also log exceptionRobin Appelman2015-11-271-0/+1
| * Skip unavailable storages in scannerRobin Appelman2015-11-275-10/+28
* | Merge pull request #20790 from owncloud/deduplicate-trashbin-jobsThomas Müller2015-11-273-26/+12
|\ \
| * | Deduplicate queued trashbin expire jobsMorris Jobke2015-11-273-26/+12
* | | Merge pull request #20792 from owncloud/autoloader-absolute-pathsThomas Müller2015-11-271-1/+5
|\ \ \
| * | | Dont bother with stream_resolve_include_path if the path is already absoluteRobin Appelman2015-11-271-1/+5
| | |/ | |/|
* | | Merge pull request #20793 from owncloud/add-app-to-shiplistThomas Müller2015-11-271-2/+3
|\ \ \
| * | | Add Workflow app to shipped listJoas Schilling2015-11-271-2/+3
* | | | Merge pull request #20782 from mitar/better-httpsThomas Müller2015-11-272-1/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Added tests.Mitar2015-11-271-0/+20
| * | | Also allow empty value for no-HTTPS.Mitar2015-11-271-1/+2
* | | | Merge pull request #20770 from owncloud/add-servercontainer-aliasThomas Müller2015-11-271-0/+1
|\ \ \ \
| * | | | Add full interface of server container as aliasMorris Jobke2015-11-261-0/+1
| | |/ / | |/| |
* | | | Merge pull request #20760 from owncloud/webdav-authredirectfixThomas Müller2015-11-272-1/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Only reject ajax auth if user is really logged outVincent Petry2015-11-262-1/+31
* | | | Merge pull request #20772 from owncloud/symfony_console-2.7.7Thomas Müller2015-11-271-0/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | [3rdparty] bump symfony/console to 2.7.7Roeland Jago Douma2015-11-271-0/+0
|/ / /
* | | Merge pull request #20765 from owncloud/punic-1.6.3Thomas Müller2015-11-271-0/+0
|\ \ \
| * | | [3rdparty] Bump punic to 1.6.3Roeland Jago Douma2015-11-261-0/+0
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-2724-22/+84
* | | Merge pull request #20706 from owncloud/federation-integration-testsThomas Müller2015-11-269-1047/+1230
|\ \ \ | |/ / |/| |
| * | Restructured FeatureContext to reuse some parts and run two servers in parallelSergio Bertolin2015-11-269-1047/+1230
|/ /
* | Merge pull request #20602 from owncloud/fix-installed-appsThomas Müller2015-11-263-4/+19
|\ \
| * | fix unit testsMorris Jobke2015-11-232-4/+13
| * | Always installed apps includes the hardcoded ones from shipped.jsonMorris Jobke2015-11-191-0/+6
* | | Merge pull request #20702 from owncloud/move-user-principal-into-subfolderThomas Müller2015-11-2612-101/+123
|\ \ \
| * | | Fix principal collection for CavDAVTesterThomas Müller2015-11-262-3/+3
| * | | Introduce \OCP\IUser::getEMailAddress()Thomas Müller2015-11-255-40/+45
| * | | Users are available under it's own principal resource named 'principals/users...Thomas Müller2015-11-258-65/+82
* | | | Merge pull request #20752 from owncloud/assetic-1.3.2Thomas Müller2015-11-261-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump assetic to 1.3.2Roeland Jago Douma2015-11-261-0/+0
* | | | | Merge pull request #20393 from owncloud/querybuilder-select-with-aliasThomas Müller2015-11-263-34/+158
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add a method to select a field or value with aliasJoas Schilling2015-11-233-34/+158
* | | | | Merge pull request #20742 from owncloud/symfony_routing-2.7.7Thomas Müller2015-11-261-0/+0
|\ \ \ \ \
| * | | | | [3rdparty] Bump symfony/routing to 2.7.7Roeland Jago Douma2015-11-261-0/+0
* | | | | | Merge pull request #20746 from owncloud/untangle-linkToDocsThomas Müller2015-11-265-17/+16
|\ \ \ \ \ \
| * | | | | | Untangle the linkToDocs method in OC_HelperMorris Jobke2015-11-265-17/+16
| |/ / / / /
* | | | | | Merge pull request #20755 from owncloud/integration_test_not_sharee_requestingThomas Müller2015-11-261-0/+10
|\ \ \ \ \ \
| * | | | | | Added test case about a user without a share requesting itSergio Bertolin2015-11-261-0/+10
| |/ / / / /
* | | | | | Merge pull request #20562 from owncloud/comments-interfacesThomas Müller2015-11-264-0/+378
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | proper description for IllegalIDChangeExceptionArthur Schiwon2015-11-261-1/+1
| * | | | | missing setters for setChildrenCount and setLatestChildDateTime (formerly …...Arthur Schiwon2015-11-231-5/+23
| * | | | | give creation datetime setter and getter a more meaningful and less misleadin...Arthur Schiwon2015-11-231-5/+5