Commit Graph

3982 Commits

Author SHA1 Message Date
Jenkins for ownCloud 955646c461 [tx-robot] updated from transifex 2013-07-05 02:21:23 +02:00
Björn Schießle 3c1308fb6d eddition string should be empty by default 2013-07-04 10:12:07 +02:00
Björn Schießle 6cfa016c39 add public api 2013-07-04 10:11:55 +02:00
Björn Schießle 3c691c9ec9 move to non-static OC_Defaults
Conflicts:

	lib/mail.php
2013-07-04 10:11:16 +02:00
Björn Schießle d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Bart Visscher 20be58bfdc Merge pull request #3888 from owncloud/ocs_api_fixes
Ocs api fixes
2013-07-03 12:33:04 -07:00
kondou aa7d8edd14 Suppress warning in setup if config doesn't exist 2013-07-03 16:00:23 +02:00
Björn Schießle 690323092e don't run hooks for .part files 2013-07-03 10:11:50 +02:00
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 2013-07-03 10:11:37 +02: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
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
Björn Schießle cb5811bcf5 backport from pull request #3863 2013-07-01 11:12:18 +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 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 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
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
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
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
icewind1991 30a403e327 Merge pull request #3892 from owncloud/static-streamwrapper
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
Thomas Mueller 66e1eaac93 isError should detect a PEAR_Error even if the backend is PDO.
This can happen on errors during schema migration - which is always done with MDB2
2013-06-28 20:16:01 +02:00
Jörn Friedrich Dreyer e62eb2e8d1 correctly handle error results of PDO and MDB2 backends 2013-06-28 20:16:01 +02:00
Robin Appelman dc0ebe9007 fix is_file and is_dir for the static streamwrapper 2013-06-28 19:54:16 +02:00
Robin Appelman 156e72a0c4 add option to clear the files in the static streamwrapper 2013-06-28 19:41:28 +02:00
Jörn Friedrich Dreyer f3c4a37a78 Merge pull request #3832 from owncloud/oracle_sql_fixes
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Robin Appelman a7c70915d5 fix storage wrapper namespaces 2013-06-28 18:18:12 +02:00
Bart Visscher 8ca0a957ad Allow setting defaults and requirements for the api route 2013-06-28 17:25:10 +02:00
Jörn Friedrich Dreyer 7d3490036c Merge pull request #3838 from rgeber/master
Public Upload Feature
2013-06-28 07:30:41 -07:00
Bart Visscher b1a2ddd149 Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
Thomas Müller 3bedb09753 Merge pull request #3843 from owncloud/sabre-exceptions
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
Bart Visscher 6ad7a0336f Oracle doesn't know & as bitwise AND
Conflicts:
	lib/public/share.php
2013-06-28 15:48:49 +02:00
Robin Appelman 125f9f4221 move storage wrappers to their own namespace 2013-06-28 15:34:25 +02:00