Commit Graph

11886 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 651f1b0995 better contrast and grouping for blocks in personal settings through darker background color 2013-06-11 14:51:06 +02:00
Jan-Christoph Borchardt 2a936670ce better contrast for controls bar 2013-06-11 14:50:23 +02:00
Jan-Christoph Borchardt 5d4ff0e537 better contrast for files list, darker greys for selection and hover 2013-06-11 14:49:34 +02:00
Jörn Friedrich Dreyer e238eeef6f Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 -07:00
Jan-Christoph Borchardt 0872f641dd darker low threshold color for file size and age fading, better contrast 2013-06-11 14:30:13 +02:00
icewind1991 a89dedf70d Merge pull request #3671 from owncloud/fix_user_creation
createUser() needs to return something; the user object or false
2013-06-11 05:02:06 -07:00
Björn Schießle 118f2b3283 createUser() needs to return something; the user object or false 2013-06-11 13:48:17 +02:00
Morris Jobke 74825de0bc Merge pull request #3666 from owncloud/allow_null_in_text_columns
db structure, allow null in columns for '' values
2013-06-11 04:42:22 -07:00
Björn Schießle 3ec6b19cdf use constants for different migration status 2013-06-11 13:07:39 +02:00
Björn Schießle 5fafd55108 make sure that only one process can enter the migration mode 2013-06-11 12:03:50 +02:00
Jörn Friedrich Dreyer e3e140993d db structure, allow null in columns for '' values 2013-06-11 11:02:57 +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
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
Jörn Friedrich Dreyer 875c18b115 fix fetchRow checks to also work with MDB2 2013-06-10 17:43:09 +02: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
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
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
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
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
Robin Appelman 0470a5ba94 fix variable name 2013-06-07 00:17:51 +02:00
Thomas Mueller 058c15a9f4 Read configuratons for external filesystem test from a private place.
This will help not to accidentially push private data and enable testing on our ci server.
2013-06-07 00:04:46 +02:00
Robin Appelman cf7321915d seperate mimetype guessing from filename 2013-06-06 23:51:44 +02:00
Björn Schießle d7a9852f7b use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened 2013-06-06 13:32:02 +02:00