The branch "horde_activesync_3_0" has been updated. The following is a summary of the commits.
from: 95091de7fcf775aafb2aba60c3c9821e285f1267 a53cd7b Fix typos 283ebd8 Merge upstream changes relating to better parsing of CSS 3 at rules 1cab464 Style tags can contain comment data. b3e4081 Another benefit of new CSS parser - better error handling c421d37 Update Horde_Histories table for IMP_Maillog entries. 078fc3d This will most likely be fixed upstream, but fix it here: don't require mb support 6eda3bd Mark mbstring as an optional dependency for Horde_Css_Parser dec7f4c Optimize output of color strings 5861bac Optimize output of size values ea170b7 Parse CSS3 numeric values correctly 9c02c01 Fix migration script e3f1b45 Fix quoting. 5314dc4 Remove useless check. 9018edd Horde_Core is not required cb83850 Fix form variable names e0d5c67 Bug #12130: Need to also check if HTML is part ID 1, not just a child of part ID 1 98cb265 Fix undefined variable. ce6cd53 [jan] Only send update notifications for local calendars. c4119ef [jan] Don't send notifications for all recurrence exceptions when deleting events. dea779a Merge branch 'master' into horde_activesync_3_0 ----------------------------------------------------------------------- commit a53cd7b47fc2fed3db069d6252dfb4099fc051de Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 13:23:46 2013 -0600 Fix typos passwd/lib/Basic.php | 2 +- passwd/lib/Driver/Procopen.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/a53cd7b47fc2fed3db069d6252dfb4099fc051de ----------------------------------------------------------------------- commit 283ebd8f3cdeaed71e8d43023beed8155553da94 Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 13:37:22 2013 -0600 Merge upstream changes relating to better parsing of CSS 3 at rules Working with the upstream developer to handle these things. This isn't currently handled at all by csstidy framework/Css_Parser/lib/Sabberworm/CSS/CSSList/AtRule.php | 28 --- .../Css_Parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php | 36 ++++ framework/Css_Parser/lib/Sabberworm/CSS/CSSList/KeyFrame.php | 10 +- framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 47 +++-- framework/Css_Parser/lib/Sabberworm/CSS/Property/AtRule.php | 13 ++ framework/Css_Parser/lib/Sabberworm/CSS/Property/CSSNamespace.php | 15 ++- framework/Css_Parser/lib/Sabberworm/CSS/Property/Charset.php | 9 +- framework/Css_Parser/lib/Sabberworm/CSS/Property/Import.php | 16 ++- framework/Css_Parser/lib/Sabberworm/CSS/Property/Selector.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php | 36 ++++ framework/Css_Parser/lib/Sabberworm/CSS/Settings.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/PrimitiveValue.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/RuleValueList.php | 2 +- framework/Css_Parser/package.xml | 12 +- 14 files changed, 169 insertions(+), 61 deletions(-) delete mode 100644 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/AtRule.php create mode 100644 framework/Css_Parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php create mode 100644 framework/Css_Parser/lib/Sabberworm/CSS/Property/AtRule.php create mode 100644 framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php http://git.horde.org/horde-git/-/commit/283ebd8f3cdeaed71e8d43023beed8155553da94 ----------------------------------------------------------------------- commit 1cab464fb6ae12207da47a0dcd743d087defe5d3 Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 14:19:29 2013 -0600 Style tags can contain comment data. HTML 4 defines all data inside of a style tag as CDATA. Some brain dead mailers (Outlook) add comment tags inside of the tag. This is bad for CSS parsing. Strip comment tags out if we see them. imp/lib/Mime/Viewer/Html.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/1cab464fb6ae12207da47a0dcd743d087defe5d3 ----------------------------------------------------------------------- commit b3e40812e74c1aa4d894f23528fa058b3cb6d06b Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 14:32:28 2013 -0600 Another benefit of new CSS parser - better error handling Unlike csstidy, which would just output as-is (possible security risk), now we can ignore malformed style data contained in HTML messages. imp/lib/Mime/Viewer/Html.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/b3e40812e74c1aa4d894f23528fa058b3cb6d06b ----------------------------------------------------------------------- commit c421d37d3f5ad41ae9971d6fab7e8880701fd60d Author: Michael J Rubinsky <[email protected]> Date: Wed Mar 20 00:28:28 2013 -0400 Update Horde_Histories table for IMP_Maillog entries. Must use ':' as the delimiter in order for change detection to work sanely. Using a DB migration for the Horde_Histories table from within IMP is a bit ugly, but because of the History API requiring this delimiter, it's impossible to perform these changes using either the IMP_Maillog or the Horde_History API. The History API should eventually be refactored to build the object_uid values internally, but that would be impossible before H6. Placing this in master since I consider this a bug fix, and not a new feature. imp/lib/Maillog.php | 2 +- imp/migration/3_imp_maillog_update.php | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletions(-) create mode 100644 imp/migration/3_imp_maillog_update.php http://git.horde.org/horde-git/-/commit/c421d37d3f5ad41ae9971d6fab7e8880701fd60d ----------------------------------------------------------------------- commit 078fc3df1177201ebd996d25875aac45a3edea29 Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 21:56:04 2013 -0600 This will most likely be fixed upstream, but fix it here: don't require mb support framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/078fc3df1177201ebd996d25875aac45a3edea29 ----------------------------------------------------------------------- commit 6eda3bd3628e2388209f8eddc34c7a0cfe8a71eb Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 21:57:17 2013 -0600 Mark mbstring as an optional dependency for Horde_Css_Parser framework/Css_Parser/package.xml | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/6eda3bd3628e2388209f8eddc34c7a0cfe8a71eb ----------------------------------------------------------------------- commit dec7f4ce6aac94252bc407183464cff48bec530c Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 23:44:54 2013 -0600 Optimize output of color strings Pull request pending upstream framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php | 19 ++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/dec7f4ce6aac94252bc407183464cff48bec530c ----------------------------------------------------------------------- commit 5861bac7cd75b36f02c320d4efaaa3c9f58ee1e7 Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 23:45:15 2013 -0600 Optimize output of size values Pull request pending upstream framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/5861bac7cd75b36f02c320d4efaaa3c9f58ee1e7 ----------------------------------------------------------------------- commit ea170b7c258d7fc17fbc7639220a338fd0a95762 Author: Michael M Slusarz <[email protected]> Date: Tue Mar 19 23:45:45 2013 -0600 Parse CSS3 numeric values correctly Pull request pending upstream. This should be the final fix necesary to allow the jquerymobile CSS to be parsed/output correctly. framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 38 +++++++------------ 1 files changed, 14 insertions(+), 24 deletions(-) http://git.horde.org/horde-git/-/commit/ea170b7c258d7fc17fbc7639220a338fd0a95762 ----------------------------------------------------------------------- commit 9c02c01ef9a7ee85943515dc5870aac6c146456d Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 00:23:13 2013 -0600 Fix migration script I *think* SQL requires single quotes here instead of double quotes. At the very least, Postgres was erroring with this message: SQLSTATE[42703]: Undefined column: 7 ERROR: column "imp.%" does not exist imp/migration/3_imp_maillog_update.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/9c02c01ef9a7ee85943515dc5870aac6c146456d ----------------------------------------------------------------------- commit e3f1b45cca42f3688ac57ae155ea87a4850881bb Author: Jan Schneider <[email protected]> Date: Wed Mar 20 10:38:06 2013 +0100 Fix quoting. imp/migration/3_imp_maillog_update.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/e3f1b45cca42f3688ac57ae155ea87a4850881bb ----------------------------------------------------------------------- commit 5314dc4acac1ea347bfa1dabf62da6a31c484007 Author: Michael J Rubinsky <[email protected]> Date: Wed Mar 20 14:07:22 2013 -0400 Remove useless check. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/5314dc4acac1ea347bfa1dabf62da6a31c484007 ----------------------------------------------------------------------- commit 9018edd6c07ac584801ec7664d9d322cde300960 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 15:07:10 2013 -0600 Horde_Core is not required framework/Css_Parser/package.xml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/9018edd6c07ac584801ec7664d9d322cde300960 ----------------------------------------------------------------------- commit cb838504fe3e091f401338b38ae94344474d0943 Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 15:10:06 2013 -0600 Fix form variable names passwd/lib/Basic.php | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/cb838504fe3e091f401338b38ae94344474d0943 ----------------------------------------------------------------------- commit e0d5c67df3cb8062b3e21236b503c4c0af58e9ed Author: Michael M Slusarz <[email protected]> Date: Wed Mar 20 16:46:10 2013 -0600 Bug #12130: Need to also check if HTML is part ID 1, not just a child of part ID 1 imp/lib/Compose.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e0d5c67df3cb8062b3e21236b503c4c0af58e9ed ----------------------------------------------------------------------- commit 98cb2655e9a5e3bf67677da90484b16fdf566708 Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:11:26 2013 +0100 Fix undefined variable. kronolith/lib/Event.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/98cb2655e9a5e3bf67677da90484b16fdf566708 ----------------------------------------------------------------------- commit ce6cd53a1f792263664ffc66d23e23281b86ed92 Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:12:14 2013 +0100 [jan] Only send update notifications for local calendars. kronolith/docs/CHANGES | 1 + kronolith/lib/Driver.php | 5 ----- kronolith/lib/Driver/Kolab.php | 6 +++++- kronolith/lib/Driver/Sql.php | 5 +++++ kronolith/package.xml | 2 ++ 5 files changed, 13 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/ce6cd53a1f792263664ffc66d23e23281b86ed92 ----------------------------------------------------------------------- commit c4119efd1d520a72ca38d745a6eb65dd52689cad Author: Jan Schneider <[email protected]> Date: Thu Mar 21 16:13:03 2013 +0100 [jan] Don't send notifications for all recurrence exceptions when deleting events. kronolith/docs/CHANGES | 2 ++ kronolith/lib/Driver/Sql.php | 2 +- kronolith/package.xml | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/c4119efd1d520a72ca38d745a6eb65dd52689cad ----------------------------------------------------------------------- commit dea779a92979558fdb2de67e7fb37cc011e0f3a6 Merge: 95091de c4119ef Author: Michael J Rubinsky <[email protected]> Date: Thu Mar 21 13:29:29 2013 -0400 Merge branch 'master' into horde_activesync_3_0 framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +- framework/Css_Parser/lib/Sabberworm/CSS/CSSList/AtRule.php | 28 -- .../Css_Parser/lib/Sabberworm/CSS/CSSList/AtRuleBlockList.php | 36 ++ framework/Css_Parser/lib/Sabberworm/CSS/CSSList/KeyFrame.php | 10 +- framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 95 +++-- framework/Css_Parser/lib/Sabberworm/CSS/Property/AtRule.php | 13 + framework/Css_Parser/lib/Sabberworm/CSS/Property/CSSNamespace.php | 15 +- framework/Css_Parser/lib/Sabberworm/CSS/Property/Charset.php | 9 +- framework/Css_Parser/lib/Sabberworm/CSS/Property/Import.php | 16 +- framework/Css_Parser/lib/Sabberworm/CSS/Property/Selector.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/RuleSet/AtRuleSet.php | 36 ++ framework/Css_Parser/lib/Sabberworm/CSS/Settings.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/Color.php | 19 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/PrimitiveValue.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/RuleValueList.php | 2 +- framework/Css_Parser/lib/Sabberworm/CSS/Value/Size.php | 4 +- framework/Css_Parser/package.xml | 24 +- imp/lib/Compose.php | 3 +- imp/lib/Maillog.php | 2 +- imp/lib/Mime/Viewer/Html.php | 15 +- imp/migration/3_imp_maillog_update.php | 55 +++ kronolith/docs/CHANGES | 3 + kronolith/lib/Driver.php | 5 - kronolith/lib/Driver/Kolab.php | 6 +- kronolith/lib/Driver/Sql.php | 7 +- kronolith/lib/Event.php | 1 + kronolith/package.xml | 4 + passwd/lib/Basic.php | 14 +- passwd/lib/Driver/Procopen.php | 2 +- 29 files changed, 316 insertions(+), 119 deletions(-) http://git.horde.org/horde-git/-/commit/dea779a92979558fdb2de67e7fb37cc011e0f3a6 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
