Björn Schießle
|
519508736d
|
disable proxys during ssl root cert upload to avoid encryption
|
2013-06-12 10:37:09 +02:00 |
Björn Schießle
|
de5eed4fb0
|
Merge branch 'master' of github.com:owncloud/core
|
2013-06-12 10:31:39 +02:00 |
Björn Schießle
|
506c9de5cd
|
backport of 1fa76e53dc
|
2013-06-12 10:30:54 +02:00 |
Georg Ehrke
|
a2fa91fdd5
|
init language object before using it
|
2013-06-12 09:40:13 +02:00 |
Jenkins for ownCloud
|
aab3b7d8ea
|
[tx-robot] updated from transifex
|
2013-06-12 03:05:58 +02:00 |
Jan-Christoph Borchardt
|
d2773982d5
|
Merge pull request #3672 from owncloud/files-contrast
Contrast fixes
|
2013-06-11 11:11:55 -07:00 |
Jan-Christoph Borchardt
|
cdedfb6f37
|
multiselect: up min-width of group multiselect to 150px
|
2013-06-11 18:23:29 +02:00 |
Jan-Christoph Borchardt
|
0bcb04398d
|
multiselect: fixed 'add group' interface a bit
|
2013-06-11 18:21:13 +02:00 |
Jan-Christoph Borchardt
|
686797eb6d
|
multiselect: more breathing space for entries
|
2013-06-11 18:08:47 +02:00 |
Jan-Christoph Borchardt
|
27996d1c64
|
multiselect: drop shadow for better focus
|
2013-06-11 18:04:33 +02:00 |
Jan-Christoph Borchardt
|
35e7b64cc2
|
multiselect: do not cut off group names
|
2013-06-11 18:04:11 +02:00 |
Jan-Christoph Borchardt
|
e6a4721f64
|
checkstyle: add space after colon
|
2013-06-11 18:02:52 +02:00 |
Jan-Christoph Borchardt
|
09ff9b2a2c
|
remove leading spaces
|
2013-06-11 18:01:50 +02:00 |
Jan-Christoph Borchardt
|
b014509f41
|
move storage bar below clients showcase to make it more visible
|
2013-06-11 16:05:02 +02:00 |
Thomas Müller
|
51f8aa90d1
|
Merge pull request #3675 from owncloud/allow_autotest_to_run_10x
allow autotest to run 10x times longer
|
2013-06-11 06:59:57 -07:00 |
Jörn Friedrich Dreyer
|
48b5e3d498
|
allow autotest to run 10x times longer
|
2013-06-11 15:57:00 +02:00 |
Jörn Friedrich Dreyer
|
0eed1c980d
|
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
fix fetchRow checks to also work with MDB2
|
2013-06-11 06:20:27 -07:00 |
Björn Schießle
|
20ddd6e1c7
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
|
2013-06-11 15:19:02 +02:00 |
Thomas Müller
|
db6080c5c6
|
Merge pull request #3673 from owncloud/gitignore-apps2
gitignore apps2 folder as well
|
2013-06-11 06:10:25 -07:00 |
Jan-Christoph Borchardt
|
ab79480dc6
|
gitignore apps2 folder as well
|
2013-06-11 14:57:06 +02:00 |
Jan-Christoph Borchardt
|
abfbd9b136
|
feedback for hover/tap on breadcrumbs
|
2013-06-11 14:51:29 +02:00 |
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 |
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 |
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 |