summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into convert-oc_configThomas Mueller2013-07-03696-4011/+4294
|\
| * Merge pull request #3911 from owncloud/fixing-unittests-masterMichael Gapczynski2013-07-031-2/+4
| |\
| | * rename can cause mtime change - invalid assertThomas Müller2013-07-011-2/+4
| * | Merge pull request #3915 from owncloud/summary_as_last_filelist_entryMorris Jobke2013-07-032-2/+47
| |\ \
| | * | Don't escape filesize (can contain a '<')kondou2013-07-021-1/+1
| | * | Show a summary as the last filelist entrykondou2013-07-022-2/+47
| * | | don't run hooks for .part filesBjörn Schießle2013-07-031-1/+1
| * | | if a part file gets renamed to a real file, that this was the second step of ...Björn Schießle2013-07-031-2/+20
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-03533-2487/+2494
| * | | Merge pull request #3858 from owncloud/more_ssl_error_messagesBjörn Schießle2013-07-021-6/+5
| |\ \ \
| | * | | add openssl_error_string() output to the owncloud.logBjörn Schießle2013-06-261-6/+5
| * | | | Merge pull request #3870 from owncloud/reset_migration_statusBjörn Schießle2013-07-024-0/+26
| |\ \ \ \
| | * | | | fix function documentationBjörn Schießle2013-06-271-1/+1
| | * | | | introduce pre-disable-app hook and use it for the encryption app to reset mig...Björn Schießle2013-06-274-0/+26
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-02251-1688/+1868
| * | | | | improved error messageBjörn Schießle2013-07-021-1/+1
| | |_|/ / | |/| | |
| * | | | Merge pull request #3748 from owncloud/fixing-3740-masterThomas Müller2013-07-011-8/+14
| |\ \ \ \
| | * | | | use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not setThomas Müller2013-07-011-2/+8
| | * | | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better tha...Thomas Mueller2013-06-171-7/+7
* | | | | | on unit test use @expectedExceptionThomas Müller2013-07-022-6/+12
* | | | | | Merge branch 'master' into convert-oc_configThomas Müller2013-07-01820-15995/+19116
|\| | | | |
| * | | | | Merge pull request #3775 from owncloud/test_fixes_for_dbschemaThomas Müller2013-07-013-61/+63
| |\ \ \ \ \
| | * | | | | Going from text to clob is not something we do.Bart Visscher2013-06-282-7/+2
| | * | | | | isError should detect a PEAR_Error even if the backend is PDO.Thomas Mueller2013-06-281-19/+23
| | * | | | | remove wrong check hereJörn Friedrich Dreyer2013-06-281-1/+0
| | * | | | | correctly handle error results of PDO and MDB2 backendsJörn Friedrich Dreyer2013-06-281-3/+6
| | * | | | | use executeAudited, add table name to assert message, skip schema changing te...Jörn Friedrich Dreyer2013-06-281-43/+44
| * | | | | | Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_blockThomas Müller2013-07-011-85/+64
| |\ \ \ \ \ \
| | * | | | | | remove unnecessary exception handlingJörn Friedrich Dreyer2013-06-201-85/+64
| * | | | | | | Merge pull request #3903 from owncloud/nonpublic-uploadingThomas Müller2013-07-012-36/+36
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | fix detection of public upload in filelist.jsRobin Appelman2013-07-011-1/+1
| | * | | | | | fix uploading when ['dirtoken'] is not setRobin Appelman2013-07-011-1/+1
| | * | | | | | code styleRobin Appelman2013-07-011-34/+34
| * | | | | | | Merge pull request #3894 from owncloud/ie8_compatibility_fixesThomas Müller2013-07-012-2/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Use svg to png fallback on demand onlyVictor Dubiniuk2013-06-281-1/+1
| | * | | | | | | Add fallback for svg app iconsVictor Dubiniuk2013-06-281-1/+5
| | * | | | | | | Hide a ghost image on the apps management pageVictor Dubiniuk2013-06-282-1/+6
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | backport from pull request #3863Björn Schießle2013-07-011-1/+1
| * | | | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-07-011-3/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #3857 from owncloud/enable_single_autotestMorris Jobke2013-07-011-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | enable testing individual testsJörn Friedrich Dreyer2013-06-261-3/+3
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | set default logo claim to ''Björn Schießle2013-07-011-1/+1
| * | | | | | | | add logo claim to defaults.phpBjörn Schießle2013-07-014-9/+12
| * | | | | | | | logo claim addedBjörn Schießle2013-07-011-0/+3
| * | | | | | | | make mail footer aware of different themesBjörn Schießle2013-07-011-3/+4
| * | | | | | | | remove unneeded if conditionBjörn Schießle2013-07-011-5/+1
| * | | | | | | | lib/defaults.php should only contain the default strings and read the other s...Björn Schießle2013-07-011-38/+44
| * | | | | | | | check for updates only in the community editionBjörn Schießle2013-07-011-1/+1
| * | | | | | | | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-015-20/+44
| |/ / / / / / /
| * | | | | | | Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-014-9/+40
| |\ \ \ \ \ \ \