summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into convert-oc_configBart Visscher2013-07-04261-620/+2059
|\
| * Merge pull request #3899 from owncloud/encryption_check_php_versionVicDeo2013-07-044-10/+24
| |\
| | * more verbose error messageBjörn Schießle2013-07-041-1/+1
| | * Merge branch 'master' into encryption_check_php_versionBjörn Schießle2013-07-029-193/+189
| | |\
| | * \ Merge branch 'encryption_check_php_version' of github.com:owncloud/core into ...Björn Schießle2013-07-022-5/+4
| | |\ \
| | | * | no ?> at the end of a fileThomas Müller2013-07-011-2/+1
| | | * | typoThomas Müller2013-07-011-3/+3
| | * | | improved error messageBjörn Schießle2013-07-021-1/+1
| | |/ /
| | * | cast result to boolBjörn Schießle2013-07-011-1/+1
| | * | fix error stringBjörn Schießle2013-07-011-1/+1
| | * | add correct php versionBjörn Schießle2013-07-011-1/+1
| | * | check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-013-7/+22
| * | | Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pwKondou2013-07-042-1/+4
| |\ \ \
| | * | | Use better wording.kondou2013-07-031-1/+1
| | * | | Add a "Wrong password." message, if the passwordkondou2013-07-022-1/+4
| * | | | revert changes which where introduced by accident during merge https://github...Björn Schießle2013-07-041-2/+3
| * | | | eddition string should be empty by defaultBjörn Schießle2013-07-041-1/+1
| * | | | add public apiBjörn Schießle2013-07-042-1/+109
| * | | | move to non-static OC_DefaultsBjörn Schießle2013-07-0410-78/+81
| * | | | Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-049-9/+42
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-04243-545/+1820
| * | | | Merge pull request #3888 from owncloud/ocs_api_fixesBart Visscher2013-07-032-1/+3
| |\ \ \ \
| | * | | | Use raw PathInfo for matching urlsBart Visscher2013-06-281-1/+1
| | * | | | Allow setting defaults and requirements for the api routeBart Visscher2013-06-281-0/+2
| * | | | | Suppress warning in setup if config doesn't existkondou2013-07-031-1/+1
* | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 02:51:38 +0000