wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11680 commits 157 branches 562 tags 714 MiB
Commit graph

11680 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
506c9de5cd backport of 1fa76e53dc 2013-06-12 10:30:54 +02:00
Jan-Christoph Borchardt
d2773982d5 Merge pull request #3672 from owncloud/files-contrast 
Contrast fixes
 2013-06-11 11:11:55 -07: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
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
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
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
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
Jenkins for ownCloud
3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +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
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
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
Björn Schießle
fdaab7372e always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not 2013-06-06 13:30:18 +02:00
Björn Schießle
97e05b71f8 add hint about what the recovery password field is for 2013-06-06 12:26:05 +02:00
Jenkins for ownCloud
81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Michael Gapczynski
cb9fe475c4 Merge branch 'master' into hook-improvements 
Conflicts:
	lib/files/view.php
 2013-06-04 18:19:08 -04:00
Thomas Müller
c59ee99d93 Merge pull request #3594 from opensaucesystems/patch-1 
Added input[type="url"] to styles.css
 2013-06-04 14:01:09 -07:00
Thomas Mueller
db1ca90319 exclude 3rdparty folder within files_external and files_encryption from code coverage 2013-06-04 22:41:52 +02:00
opensaucesystems
d987bea635 Added input[type="url"] to styles.css 2013-06-04 16:04:29 +02:00
Arthur Schiwon
4976f2e0d3 LDAP: append port when URL is passed in LDAP Host configuration, fixes #2600 2013-06-04 10:32:54 +02:00