Commit Graph

12048 Commits

Author SHA1 Message Date
Jenkins for ownCloud 811cf02675 [tx-robot] updated from transifex 2013-07-03 02:04:16 +02:00
Björn Schießle 4c1820a2a1 Merge pull request #3858 from owncloud/more_ssl_error_messages
add openssl_error_string() output to the owncloud.log
2013-07-02 07:58:22 -07:00
Björn Schießle 4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status
introduce pre-disable-app hook and first usage in files_encryption
2013-07-02 07:26:48 -07:00
Jenkins for ownCloud cec8384b1a [tx-robot] updated from transifex 2013-07-02 15:35:55 +02:00
Björn Schießle 29dd7eda2d improved error message 2013-07-02 10:11:42 +02:00
Thomas Müller fbdf46b76e Merge pull request #3748 from owncloud/fixing-3740-master
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
2013-07-01 15:08:08 -07:00
Thomas Müller 7d7a2ce317 use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set 2013-07-01 23:51:43 +02:00
Thomas Müller c777026506 Merge pull request #3775 from owncloud/test_fixes_for_dbschema
use executeAudited, add table name to assert message, skip schema changi...
2013-07-01 14:38:28 -07:00
Thomas Müller bf901eb52f Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
2013-07-01 14:37:09 -07:00
Thomas Müller 5fff4e0d08 Merge pull request #3903 from owncloud/nonpublic-uploading
Fix upload regressions
2013-07-01 12:35:32 -07:00
Thomas Müller a20e9dee89 Merge pull request #3894 from owncloud/ie8_compatibility_fixes
Ie8 compatibility fixes
2013-07-01 11:57:29 -07:00
Robin Appelman 492c0571a0 fix detection of public upload in filelist.js 2013-07-01 15:47:40 +02:00
Robin Appelman 86342224da fix uploading when ['dirtoken'] is not set 2013-07-01 15:39:11 +02:00
Robin Appelman e55ed10b0d code style 2013-07-01 15:37:52 +02:00
Björn Schießle cb5811bcf5 backport from pull request #3863 2013-07-01 11:12:18 +02:00
Björn Schießle 7b0e3e6303 Merge branch 'master' of github.com:owncloud/core 2013-07-01 10:48:58 +02:00
Björn Schießle d8b3aee24e set default logo claim to '' 2013-07-01 10:48:26 +02:00
Björn Schießle d97d00fe0f add logo claim to defaults.php 2013-07-01 10:48:13 +02:00
Björn Schießle aead759f47 logo claim added 2013-07-01 10:48:02 +02:00
Björn Schießle f622f35a1a make mail footer aware of different themes
Conflicts:

	lib/mail.php
2013-07-01 10:47:44 +02:00
Björn Schießle 68369ebb86 remove unneeded if condition 2013-07-01 10:46:49 +02:00
Björn Schießle 996b1e80c6 lib/defaults.php should only contain the default strings and read the other strings directly from the theme 2013-07-01 10:46:27 +02:00
Björn Schießle 87bbdc1ed9 check for updates only in the community edition 2013-07-01 10:46:16 +02:00
Björn Schießle 23cc69b816 construct the foother in defaults.php so that we use always the same footer
Conflicts:

	settings/templates/admin.php
2013-07-01 10:46:00 +02:00
Morris Jobke 180faa24a1 Merge pull request #3857 from owncloud/enable_single_autotest
enable testing individual tests
2013-07-01 01:42:39 -07:00
Morris Jobke b19033b353 Merge pull request #3223 from owncloud/fix-2820
if rename of file fails, the rename is undone in the view - fix 2820
2013-07-01 01:28:17 -07:00
Jenkins for ownCloud 80a8b9c995 [tx-robot] updated from transifex 2013-07-01 03:28:25 +02:00
Thomas Müller 121d3904c9 Merge pull request #3852 from owncloud/fixing-3830-master
session life time is now configurable and set to the same value
2013-06-30 14:41:51 -07:00
Thomas Müller 8beec2015a Merge pull request #3763 from owncloud/recursive-rmdir
Make rmdir recursive for local storage
2013-06-30 09:16:32 -07:00
Robin Appelman d051d6f925 make rmdir recursive for mappellocal storage backend 2013-06-30 17:44:49 +02:00
Jenkins for ownCloud 4d74e8955f [tx-robot] updated from transifex 2013-06-30 02:13:07 +02:00
Thomas Müller b28b6da4cd Merge pull request #3897 from bantu/gitignore
gitignore: Make paths relative to repository root.
2013-06-29 14:48:34 -07:00
Thomas Müller 2c7549f17e Merge pull request #2703 from owncloud/cleanup-setup
Cleanup OC_Setup
2013-06-29 14:47:29 -07:00
Bart Visscher 60eb63e35a Fix review items 2013-06-29 21:15:06 +02:00
Bart Visscher e93ce26f27 Fix found errors 2013-06-29 21:15:06 +02:00
Bart Visscher 42c44d5165 Fix OCI setupDatabase parameter 2013-06-29 21:15:06 +02:00
Bart Visscher bf30e03048 Remove unsued parameter 2013-06-29 21:15:05 +02:00
Bart Visscher 6831b78597 Use db setup class for option validation 2013-06-29 21:15:05 +02:00
Bart Visscher 2faccaee0d Change database creation to use array to select db setup class 2013-06-29 21:07:11 +02:00
Bart Visscher e232907698 Convert database setup code to objects 2013-06-29 21:07:11 +02:00
Bart Visscher a6d07cd512 Split database specific install/setup code to their own class 2013-06-29 21:07:11 +02:00
Andreas Fischer 4da9eaa4c7 gitignore: Make paths relative to repository root.
Paths without the leading slash apply to all subdirectories, which especially
means that /tests/data is ignored, making it unnecessarily hard to add test
data.
2013-06-29 16:33:42 +02:00
Bart Visscher ae48e5b496 Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241
Escape dropdown
2013-06-29 04:38:18 -07:00
Lukas Reschke 0217315a24 Escape dropdown
Fixes #3241
2013-06-29 13:24:05 +02:00
Bart Visscher 414b5f150e Merge pull request #2914 from Kondou-ger/label_overlapping_value
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
Bart Visscher bd3e266408 Merge pull request #3688 from roha4000/fix_upload_max_filesize
upload_max_filesize = 0 not possible if post_max_size is not 0
2013-06-29 04:07:34 -07:00
Bart Visscher d699ee9845 Merge pull request #3635 from owncloud/storage-wrapper
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
Bart Visscher 68c0d54568 Merge pull request #3268 from owncloud/convert-oc_log
Convert OC_Log to object so it can be used for DI
2013-06-29 03:38:56 -07:00
Jenkins for ownCloud d2f50bc089 [tx-robot] updated from transifex 2013-06-29 02:09:10 +02:00
Thomas Müller dfa6aa25c3 Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-enabled-master
for now we disable public upload in case encryption is enabled
2013-06-28 13:59:33 -07:00