summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #20877 from owncloud/fix-empty-expirationDateThomas Müller2015-12-021-1/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Check the expiration date for nullMorris Jobke2015-12-011-1/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-0212-10/+36
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #20883 from owncloud/avatar_diRoeland Douma2015-12-027-126/+266
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | DI in avatar codeRoeland Jago Douma2015-12-017-126/+266
|/ / / / /
* | | | | Merge pull request #14081 from owncloud/use-pretty-urlsLukas Reschke2015-12-019-5/+61
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Support pretty URLsLukas Reschke2015-12-019-5/+61
|/ / / /
* | | | Merge pull request #20285 from owncloud/add-integrity-checkerThomas Müller2015-12-0143-11/+3262
|\ \ \ \
| * | | | Add code integrity checkLukas Reschke2015-12-0143-11/+3262
| | |/ / | |/| |
* | | | Merge pull request #20710 from owncloud/files_external_config_commandThomas Müller2015-12-014-0/+220
|\ \ \ \ | |_|_|/ |/| | |
| * | | return non 0 status code in case of missing mountRobin Appelman2015-12-011-1/+1
| * | | Add command to set mount options for external storagesRobin Appelman2015-12-014-10/+114
| * | | Add command to get and set config for external mountsRobin Appelman2015-12-012-0/+116
| |/ /
* | | Merge pull request #20868 from owncloud/revert-20842-fix-date-time-columnThomas Müller2015-12-011-2/+2
|\ \ \ | |_|/ |/| |
| * | Revert "Fix column width of mtime column"Morris Jobke2015-12-011-2/+2
* | | Merge pull request #20861 from owncloud/systemtags-better-exceptions-docsThomas Müller2015-12-012-4/+4
|\ \ \ | |/ / |/| |
| * | Fix the docs of the exceptions and remove hardcoded language from the messageJoas Schilling2015-12-012-4/+4
* | | Merge pull request #20859 from owncloud/autotest-coverageThomas Müller2015-12-011-1/+1
|\ \ \ | |_|/ |/| |
| * | Make autotest.sh able to output proper coverage againRoeland Jago Douma2015-12-011-1/+1
|/ /
* | Merge pull request #20855 from owncloud/output-log-integration-testsThomas Müller2015-12-011-2/+7
|\ \
| * | tail the server log and exit with the exit code of behatThomas Müller2015-12-011-2/+7
| |/
* | Merge pull request #20850 from owncloud/use-text-instead-of-htmlThomas Müller2015-12-011-3/+3
|\ \
| * | Use .text instead of .htmlLukas Reschke2015-11-301-3/+3
* | | Merge pull request #20853 from owncloud/php-parser-1.4.1Thomas Müller2015-12-011-0/+0
|\ \ \
| * | | [3rdparty] Bump php-parserRoeland Jago Douma2015-12-011-0/+0
| | |/ | |/|
* | | Merge pull request #20825 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-016-9/+9
|\ \ \ | |/ / |/| |
| * | Adjust patchesThomas Müller2015-11-303-6/+6
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-11-305-6/+6
* | | Merge pull request #20851 from owncloud/tests-for-kill-rebuild-parserThomas Müller2015-12-011-0/+0
|\ \ \
| * | | Remove some unrequired filesLukas Reschke2015-12-011-0/+0
|/ / /
* | / [tx-robot] updated from transifexJenkins for ownCloud2015-12-016-6/+132
| |/ |/|
* | Merge pull request #20828 from owncloud/sharing_integration_test_20645_morrisThomas Müller2015-11-306-20/+122
|\ \ | |/ |/|
| * Change from with ofSergio Bertolin2015-11-302-16/+16
| * Added webdav test to check range downloadsSergio Bertolin2015-11-302-0/+22
| * Making propfinds, having depth in mind and checking it in gherkin descriptionSergio Bertolin2015-11-302-17/+25
| * Use depth 1 and valid properties to get a listVincent Petry2015-11-271-1/+2
| * Added sabre dav in webdav, modified skeleton to have parent and child foldersSergio Bertolin2015-11-274-6/+77
* | Merge pull request #20842 from owncloud/fix-date-time-columnThomas Müller2015-11-301-2/+2
|\ \
| * | Fix column width of mtime columnMorris Jobke2015-11-301-2/+2
* | | Merge pull request #20784 from owncloud/jeremeamia_superclosure_2.1.0Thomas Müller2015-11-301-0/+0
|\ \ \
| * | | [3rdparty] bump jeremeamia/superclosure to 2.1.0Roeland Jago Douma2015-11-271-0/+0
* | | | Merge pull request #20829 from owncloud/dav-define-phpunitThomas Müller2015-11-300-0/+0
|\ \ \ \
| * | | | Fix already defined warning from dav test bootstrapRobin Appelman2015-11-301-1/+3
* | | | | Merge pull request #20845 from owncloud/allow-di-in-appsThomas Müller2015-11-302-1/+9
|\ \ \ \ \
| * | | | | Allow DI the system tag stuff without Application classJoas Schilling2015-11-302-1/+9
* | | | | | Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favoritesThomas Müller2015-11-303-18/+50
|\ \ \ \ \ \
| * | | | | | Inject the database connectionJoas Schilling2015-11-303-2/+16
| * | | | | | Only require the interfaceJoas Schilling2015-11-302-10/+10
| * | | | | | Add a unit test that executes the queryJoas Schilling2015-11-301-0/+15
| * | | | | | Correctly escape the paths so we only display favorites instead of wildcardsJoas Schilling2015-11-301-1/+1