Commit Graph

56476 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer e3e140993d db structure, allow null in columns for '' values 2013-06-11 11:02:57 +02:00
Georg Ehrke 28cf63d37d check if imagick is loaded in office.php, not in libreoffice-cl.php 2013-06-11 11:00:44 +02:00
Georg Ehrke 2ff97917e9 code optimization 2013-06-11 10:56:16 +02:00
Thomas Müller 74b1f7d448 Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
Georg Ehrke 0e4f5001d5 don't crop Y axis 2013-06-11 10:45:50 +02:00
Björn Schießle 64593e4b84 update submodule 2013-06-11 10:02:55 +02:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +02:00
Thomas Mueller 74a170f2a5 [Fixing unit tests in Windows]
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00
Thomas Mueller c0b25a4375 [Fixing Updater Unit Tests on Windows]
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
Thomas Mueller 073306eaa2 [Fixing Updater Unit Tests on Windows]
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added  in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
Michael Gapczynski 969e43c87b Can't determine if debug mode is defined until we read the config 2013-06-10 12:07:25 -04:00
Jörn Friedrich Dreyer 875c18b115 fix fetchRow checks to also work with MDB2 2013-06-10 17:43:09 +02:00
Michael Gapczynski b7b6075d55 Fix potential glob error 2013-06-10 11:42:20 -04:00
Thomas Müller b66559247a Merge pull request #3653 from owncloud/shorten_identifiers_in_tests
shorten table identifiers in tests
2013-06-10 08:38:54 -07:00
Thomas Mueller 988b539dd7 Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests 2013-06-10 17:27:21 +02:00
Jörn Friedrich Dreyer c70a0f791d allow 30 sec for testDeleteFile 2013-06-10 14:45:39 +02:00
Morris Jobke 1da112750e Merge pull request #3647 from owncloud/missing_backticks
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Jörn Friedrich Dreyer 86c5243be5 remove duplicate logging from db.php, now happens in entrypoints 2013-06-10 14:03:12 +02:00
Jörn Friedrich Dreyer 8dc6bdd96b clean up usage of DatabaseSetupException and catch Exceptions in entrypoints 2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer c0bdbd9d81 introduce and use executeAudited in db.php 2013-06-10 12:56:45 +02:00
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
Jörn Friedrich Dreyer d264d0a79d Merge pull request #3648 from owncloud/sql_limit_as_param
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Jörn Friedrich Dreyer fc27052887 shorten table identifiers in tests 2013-06-10 11:44:04 +02:00
Björn Schießle db06b906e5 Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Georg Ehrke 25e8ac1c2f implement previews for single shared files 2013-06-10 11:01:12 +02:00
Jörn Friedrich Dreyer 5ec13742b3 use to_char to allow comparing string to CLOB cloumns in oracle 2013-06-10 10:33:02 +02:00
Jörn Friedrich Dreyer b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Georg Ehrke a2bb0faec6 Merge branch 'master' into oc_preview 2013-06-10 10:15:53 +02:00
Jörn Friedrich Dreyer 307f1626e8 convert LIMIT to parameter 2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer 124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer 73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
Jenkins for ownCloud b237d03791 [tx-robot] updated from transifex 2013-06-10 02:06:36 +02:00
Jenkins for ownCloud 78286d0262 [tx-robot] updated from transifex 2013-06-09 02:06:21 +02:00
infoneo 199207253e Update mapper.php 2013-06-08 19:44:58 +03:00
infoneo b39113ae3e Update mapper.php
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Björn Schießle b25ab94a08 only check for recovery key if someone else than the user wants to change the password 2013-06-07 20:17:48 +02:00
Robin Appelman 94ca576c9a use a getter for the storage loader to ensure the instance is created 2013-06-07 17:50:10 +02:00
Robin Appelman 31693d3937 add test cases for Mount 2013-06-07 17:40:38 +02:00
Robin Appelman 2708ab09ab storage loader needs to be accessible by apps 2013-06-07 17:40:19 +02:00
Robin Appelman 85a9b7f094 Storage wrapper: provide access to the wrapped storage 2013-06-07 17:12:45 +02:00
Robin Appelman f35578ec54 merge master into storage-wrapper 2013-06-07 17:12:16 +02:00
Robin Appelman bd67512409 manage creating and wrapping storages in it's own class 2013-06-07 17:07:13 +02:00
Michael Gapczynski 9ef989f917 Merge pull request #2919 from owncloud/hook-improvements
Hook improvements
2013-06-07 06:35:50 -07:00
Morris Jobke 1cace9b0a3 Merge pull request #3628 from owncloud/update_3rdparty_submodule
update 3rdparty submodule
2013-06-07 02:43:22 -07:00
Georg Ehrke 6a99d6ed45 update 3rdparty submodule 2013-06-07 10:44:16 +02:00
Georg Ehrke 8114537310 Merge branch 'master' into oc_preview 2013-06-07 09:46:13 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Thomas Müller 705ab358d8 Merge pull request #3622 from owncloud/read-extfx-confg-from-home
Read configuratons for external filesystem test from a private place.
2013-06-06 16:19:48 -07:00
Robin Appelman 85abede9bf actually return result 2013-06-07 00:22:05 +02:00