Commit Graph

12099 Commits (f29dd1c784b736e5d5398f936733409c0db0160d)
 

Author SHA1 Message Date
Robin Appelman f29dd1c784 fix test case whitespace 12 years ago
Bart Visscher ad9458e85d Merge branch 'master' into convert-oc_config 12 years ago
VicDeo f67fc78531 Merge pull request #3899 from owncloud/encryption_check_php_version 12 years ago
Björn Schießle f30dd1557e more verbose error message 12 years ago
Kondou 63c83ff50b Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw 12 years ago
Björn Schießle 5f2378be5b revert changes which where introduced by accident during merge 23cc69b816 12 years ago
Björn Schießle 3c1308fb6d eddition string should be empty by default 12 years ago
Björn Schießle 6cfa016c39 add public api 12 years ago
Björn Schießle 3c691c9ec9 move to non-static OC_Defaults 12 years ago
Björn Schießle d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 12 years ago
Jenkins for ownCloud 51cfacd789 [tx-robot] updated from transifex 12 years ago
Bart Visscher 20be58bfdc Merge pull request #3888 from owncloud/ocs_api_fixes 12 years ago
kondou 65bcedfbbe Use better wording. 12 years ago
Thomas Mueller 32d69f6889 Merge branch 'master' into convert-oc_config 12 years ago
kondou aa7d8edd14 Suppress warning in setup if config doesn't exist 12 years ago
Michael Gapczynski 33e1ced53c Merge pull request #3911 from owncloud/fixing-unittests-master 12 years ago
Morris Jobke 56e91aa7b3 Merge pull request #3915 from owncloud/summary_as_last_filelist_entry 12 years ago
Björn Schießle 690323092e don't run hooks for .part files 12 years ago
Björn Schießle 04e4d9580f if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal 12 years ago
Jenkins for ownCloud 811cf02675 [tx-robot] updated from transifex 12 years ago
Björn Schießle 4c1820a2a1 Merge pull request #3858 from owncloud/more_ssl_error_messages 12 years ago
Björn Schießle 4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status 12 years ago
Jenkins for ownCloud cec8384b1a [tx-robot] updated from transifex 12 years ago
Björn Schießle 3fc5b34247 Merge branch 'master' into encryption_check_php_version 12 years ago
Björn Schießle 38ed00398f Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version 12 years ago
kondou 063b0a2d17 Don't escape filesize (can contain a '<') 12 years ago
Björn Schießle 40e6ede6a2 improved error message 12 years ago
Björn Schießle 29dd7eda2d improved error message 12 years ago
kondou b1d0de95a9 Show a summary as the last filelist entry 12 years ago
kondou 2c4a9e0776 Add a "Wrong password." message, if the password 12 years ago
Thomas Müller e789e05675 on unit test use @expectedException 12 years ago
Thomas Müller fbdf46b76e Merge pull request #3748 from owncloud/fixing-3740-master 12 years ago
Thomas Müller 7d7a2ce317 use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set 12 years ago
Thomas Müller bb07dde988 Merge branch 'master' into convert-oc_config 12 years ago
Thomas Müller c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema 12 years ago
Thomas Müller bf901eb52f Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block 12 years ago
Thomas Müller b4f7a88788 rename can cause mtime change - invalid assert 12 years ago
Thomas Müller 5fff4e0d08 Merge pull request #3903 from owncloud/nonpublic-uploading 12 years ago
Thomas Müller 3b1018ec00 no ?> at the end of a file 12 years ago
Thomas Müller a7f2563990 typo 12 years ago
Thomas Müller a20e9dee89 Merge pull request #3894 from owncloud/ie8_compatibility_fixes 12 years ago
Björn Schießle d5c4854708 cast result to bool 12 years ago
Robin Appelman 492c0571a0 fix detection of public upload in filelist.js 12 years ago
Robin Appelman 86342224da fix uploading when ['dirtoken'] is not set 12 years ago
Robin Appelman e55ed10b0d code style 12 years ago
Björn Schießle 9512382ae0 fix error string 12 years ago
Björn Schießle 16a719173f add correct php version 12 years ago
Björn Schießle adcee5b695 check php version, the encryption app needs php >= 5.3.3 12 years ago
Björn Schießle cb5811bcf5 backport from pull request #3863 12 years ago
Björn Schießle 7b0e3e6303 Merge branch 'master' of github.com:owncloud/core 12 years ago