Tickets :: Comment on [#10324] Cannot open Email with attached .ics

* Your Email Address
* Spam protection	Enter the letters below: .__.. ..__. ..__. [__]\|_/ [__] \|[__] \| \|\| \\| \|\__\|\| \|
Comment	> Changes have been made in Git (master): > > commit 8d3cc35f89a2bc3c105008ebc4ce7b53a344518e > Merge: 3a666a8 d6f10fb > Author: Michael J Rubinsky <mrubinsk@horde.org> > Date: Sun Nov 13 01:36:55 2011 -0500 > > Merge branch 'master' into develop > > Conflicts: > horde/package.xml > > components/data/qc_standards/phpcs.xml \| 60 +++ > components/data/qc_standards/phpmd.xml \| 39 ++ > components/lib/Components/Dependencies.php \| 7 + > .../lib/Components/Dependencies/Bootstrap.php \| 10 + > .../lib/Components/Dependencies/Injector.php \| 10 + > components/lib/Components/Helper/DocsOrigin.php \| 4 +- > components/lib/Components/Helper/Website.php \| 22 +- > components/lib/Components/Module/Qc.php \| 122 ++++++ > components/lib/Components/Module/Webdocs.php \| 10 +- > components/lib/Components/Output.php \| 5 + > components/lib/Components/Qc/Task/Base.php \| 206 ++++++++++ > components/lib/Components/Qc/Task/Cpd.php \| 81 ++++ > components/lib/Components/Qc/Task/Cs.php \| 82 ++++ > components/lib/Components/Qc/Task/Lint.php \| 78 ++++ > components/lib/Components/Qc/Task/Md.php \| 84 ++++ > components/lib/Components/Qc/Task/Unit.php \| 79 ++++ > components/lib/Components/Qc/Tasks.php \| 139 +++++++ > components/lib/Components/Runner/Qc.php \| 117 ++++++ > components/package.xml \| 50 +++- > .../lib/Horde/ActiveSync/State/History.php \| 4 + > .../test/Horde/ActiveSync/TimezoneTest.php \| 11 + > framework/Core/js/prettyautocomplete.js \| 6 +- > framework/Icalendar/lib/Horde/Icalendar.php \| 21 +- > framework/Icalendar/package.xml \| 4 +- > .../Icalendar/test/Horde/Icalendar/#bug_7423.phpt# \| 32 ++ > .../Icalendar/test/Horde/Icalendar/bug_10324.php \| 6 + > .../Icalendar/test/Horde/Icalendar/bug_10324.phpt \| 8 + > .../test/Horde/Icalendar/fixtures/bug10324.ics \| 24 ++ > .../doc/Horde/Kolab/Format/DOCS_ORIGIN \| 11 + > .../Kolab_Format/doc/Horde/Kolab/Format/README \| 2 + > .../doc/Horde/Kolab/Format/examples/event.php \| 11 +- > .../doc/Horde/Kolab/Format/examples/event_v2.php \| 45 +++ > framework/Kolab_Format/lib/Horde/Kolab/Format.php \| 8 +- > .../Kolab_Format/lib/Horde/Kolab/Format/Date.php \| 18 +- > .../lib/Horde/Kolab/Format/Decorator/Memory.php \| 22 +- > .../lib/Horde/Kolab/Format/Decorator/Timed.php \| 15 +- > .../Horde/Kolab/Format/Exception/ParseError.php \| 6 +- > .../lib/Horde/Kolab/Format/Factory.php \| 9 +- > .../Kolab_Format/lib/Horde/Kolab/Format/Xml.php \| 4 +- > .../lib/Horde/Kolab/Format/Xml/Annotation.php \| 4 +- > .../Horde/Kolab/Format/Xml/Distributionlist.php \| 4 +- > .../lib/Horde/Kolab/Format/Xml/Event.php \| 4 +- > .../lib/Horde/Kolab/Format/Xml/Hprefs.php \| 4 +- > .../lib/Horde/Kolab/Format/Xml/Parser.php \| 2 - > .../lib/Horde/Kolab/Format/Xml/Task.php \| 4 +- > .../Horde/Kolab/Format/Xml/Type/AutomaticDate.php \| 17 +- > .../lib/Horde/Kolab/Format/Xml/Type/Base.php \| 27 +- > .../lib/Horde/Kolab/Format/Xml/Type/Composite.php \| 11 +- > .../Horde/Kolab/Format/Xml/Type/EventDate/V1.php \| 40 ++ > framework/Kolab_Format/package.xml \| 43 ++- > .../Kolab_Storage/lib/Horde/Kolab/Storage/Base.php \| 13 +- > .../lib/Horde/Kolab/Storage/Cache.php \| 2 +- > .../lib/Horde/Kolab/Storage/Cache/Data.php \| 18 +- > .../lib/Horde/Kolab/Storage/Cache/List.php \| 7 +- > .../lib/Horde/Kolab/Storage/Cached.php \| 34 +- > .../lib/Horde/Kolab/Storage/Data/Base.php \| 13 +- > .../lib/Horde/Kolab/Storage/Data/Cached.php \| 22 +- > .../lib/Horde/Kolab/Storage/Data/Decorator/Log.php \| 7 +- > .../lib/Horde/Kolab/Storage/Data/Format/Mime.php \| 30 +- > .../Horde/Kolab/Storage/Data/Parser/Structure.php \| 5 +- > .../Kolab/Storage/Data/Query/History/Base.php \| 7 +- > .../Kolab/Storage/Data/Query/Preferences/Base.php \| 7 +- > .../Kolab/Storage/Data/Query/Preferences/Cache.php \| 7 +- > .../Kolab/Storage/Decorator/Synchronization.php \| 7 +- > .../lib/Horde/Kolab/Storage/Driver/Base.php \| 9 +- > .../lib/Horde/Kolab/Storage/Driver/Cclient.php \| 14 +- > .../Horde/Kolab/Storage/Driver/Decorator/Base.php \| 4 +- > .../Horde/Kolab/Storage/Driver/Decorator/Log.php \| 2 +- > .../Horde/Kolab/Storage/Driver/Decorator/Timer.php \| 9 +- > .../lib/Horde/Kolab/Storage/Driver/Mock.php \| 11 +- > .../lib/Horde/Kolab/Storage/Driver/Rcube.php \| 2 +- > .../lib/Horde/Kolab/Storage/Factory.php \| 11 +- > .../lib/Horde/Kolab/Storage/Folder/Base.php \| 11 +- > .../Horde/Kolab/Storage/Folder/Decorator/Base.php \| 7 +- > .../Kolab/Storage/Folder/Decorator/Trigger.php \| 10 +- > .../lib/Horde/Kolab/Storage/List/Base.php \| 7 +- > .../Horde/Kolab/Storage/List/Decorator/Cache.php \| 7 +- > .../lib/Horde/Kolab/Storage/List/Decorator/Log.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/Acl/Base.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/Acl/Cache.php \| 7 +- > .../Kolab/Storage/List/Query/ActiveSync/Base.php \| 7 +- > .../Kolab/Storage/List/Query/ActiveSync/Cache.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/List/Base.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/List/Cache.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/Share/Base.php \| 7 +- > .../Horde/Kolab/Storage/List/Query/Share/Cache.php \| 7 +- > .../lib/Horde/Kolab/Storage/QuerySet/Base.php \| 10 +- > .../lib/Horde/Kolab/Storage/QuerySet/Cached.php \| 15 +- > .../lib/Horde/Kolab/Storage/QuerySet/Uncached.php \| 6 +- > .../lib/Horde/Kolab/Storage/Uncached.php \| 20 +- > framework/Kolab_Storage/package.xml \| 34 +- > framework/Pear/doc/Horde/Pear/DOCS_ORIGIN \| 11 + > framework/Pear/doc/Horde/Pear/README \| 27 ++ > framework/Pear/doc/Horde/Pear/TODO \| 8 +- > .../lib/Horde/Pear/Package/Task/UpdateContents.php \| 8 +- > framework/Pear/lib/Horde/Pear/Package/Xml.php \| 21 +- > .../Pear/lib/Horde/Pear/Package/Xml/Contents.php \| 8 +- > .../Pear/lib/Horde/Pear/Package/Xml/Directory.php \| 12 +- > .../Horde/Pear/Package/Xml/Element/Directory.php \| 6 +- > framework/Pear/lib/Horde/Pear/Remote.php \| 6 +- > framework/Pear/lib/Horde/Pear/Rest.php \| 4 +- > .../Pear/test/Horde/Pear/Unit/RegistryTest.php \| 2 +- > framework/Pear/test/Horde/Pear/Unit/RemoteTest.php \| 2 +- > framework/Pear/test/Horde/Pear/Unit/RestTest.php \| 4 +- > framework/Push/lib/Horde/Push/Factory/Push.php \| 6 +- > .../lib/Horde/Service/Weather/Base.php \| 39 ++- > .../lib/Horde/Service/Weather/Current/Base.php \| 10 +- > .../lib/Horde/Service/Weather/Current/Google.php \| 26 +- > .../Service/Weather/Current/WeatherUnderground.php \| 37 ++- > .../lib/Horde/Service/Weather/Forecast/Base.php \| 17 + > .../lib/Horde/Service/Weather/Forecast/Google.php \| 5 + > .../Weather/Forecast/WeatherUnderground.php \| 5 + > .../lib/Horde/Service/Weather/Google.php \| 17 +- > .../lib/Horde/Service/Weather/Period/Base.php \| 12 - > .../lib/Horde/Service/Weather/Period/Google.php \| 5 + > .../Service/Weather/Period/WeatherUnderground.php \| 29 ++- > .../Horde/Service/Weather/WeatherUnderground.php \| 33 ++- > .../Service/Weather/WeatherUnderground_Strings.php \| 151 +++++++ > horde/config/conf.xml \| 15 - > horde/docs/CHANGES \| 2 + > horde/lib/Block/Weather.php \| 323 +++++++++++++++ > horde/lib/Block/Weatherdotcom.php \| 418 > -------------------- > horde/lib/LoginTasks/SystemTask/Upgrade.php \| 29 ++- > horde/package.xml \| 11 +- > skeleton/test/Skeleton/Autoload.php \| 4 +- > skeleton/test/Skeleton/ExampleTest.php \| 2 +- > timeobjects/lib/Driver/Weather.php \| 58 ++- > wicked/docs/CHANGES \| 2 + > wicked/lib/Text_Wiki/Render/Rst/List.php \| 64 +++ > wicked/lib/Text_Wiki/Render/Rst/Tt.php \| 2 +- > wicked/package.xml \| 20 +- > wicked/test/Wicked/Unit/RstTest.php \| 59 +++- > wicked/test/Wicked/fixtures/cli_modular.rst \| 46 ++-- > 133 files changed, 2681 insertions(+), 948 deletions(-) > > http://git.horde.org/horde-git/-/commit/8d3cc35f89a2bc3c105008ebc4ce7b53a344518e
Attachment
Watch this ticket

Saved Queries