summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-25 17:49:53 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-25 17:49:53 +0100
commit92964a4a6c40539ba100f71c3c5be35930be2867 (patch)
treef519caf31a9c308d667ccdecc7034ebdc1178ef2
parentdc088e25c2e96969705de7424bf18390b1505354 (diff)
parent0d4ccb8d8883769ccff175a52b15f9cb2fc442c5 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--plugins/managesieve/Changelog1
-rw-r--r--plugins/managesieve/lib/Roundcube/rcube_sieve.php (renamed from plugins/managesieve/lib/rcube_sieve.php)0
-rw-r--r--plugins/managesieve/lib/Roundcube/rcube_sieve_script.php (renamed from plugins/managesieve/lib/rcube_sieve_script.php)0
-rw-r--r--plugins/managesieve/tests/Parser.php2
-rw-r--r--plugins/managesieve/tests/Tokenizer.php2
-rw-r--r--skins/larry/mail.css3
6 files changed, 5 insertions, 3 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index dceac7602..4b839a8b2 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,5 @@
- Fixed filter activation/deactivation confirmation message (#1488765)
+- Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
* version 6.0 [2012-10-03]
-----------------------------------------------------------
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
index 16c584b7d..16c584b7d 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
diff --git a/plugins/managesieve/lib/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index 36eb1bcf8..36eb1bcf8 100644
--- a/plugins/managesieve/lib/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
diff --git a/plugins/managesieve/tests/Parser.php b/plugins/managesieve/tests/Parser.php
index 2f24870e2..9050f09c6 100644
--- a/plugins/managesieve/tests/Parser.php
+++ b/plugins/managesieve/tests/Parser.php
@@ -5,7 +5,7 @@ class Parser extends PHPUnit_Framework_TestCase
function setUp()
{
- include_once dirname(__FILE__) . '/../lib/rcube_sieve_script.php';
+ include_once dirname(__FILE__) . '/../lib/Roundcube/rcube_sieve_script.php';
}
/**
diff --git a/plugins/managesieve/tests/Tokenizer.php b/plugins/managesieve/tests/Tokenizer.php
index 8c0bced23..e71bae015 100644
--- a/plugins/managesieve/tests/Tokenizer.php
+++ b/plugins/managesieve/tests/Tokenizer.php
@@ -5,7 +5,7 @@ class Tokenizer extends PHPUnit_Framework_TestCase
function setUp()
{
- include_once dirname(__FILE__) . '/../lib/rcube_sieve_script.php';
+ include_once dirname(__FILE__) . '/../lib/Roundcube/rcube_sieve_script.php';
}
function data_tokenizer()
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 71b33571c..48eba6e02 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -52,7 +52,7 @@
bottom: 0;
width: 100%;
height: 27px;
- border-radius: 0 0 4px 4px;
+ border-radius: 4px;
border-top: none;
}
@@ -145,6 +145,7 @@ a.iconbutton.threadmode.selected {
#mailboxlist li:first-child {
border-radius: 4px 4px 0 0;
+ border-top: 0;
}
#mailboxlist li.mailbox a {