[commits] Horde branch develop updated. fa7b0e5978832e98e39182f6e98b613d6129f9cc
Michael M Slusarz
slusarz at horde.org
Tue Dec 13 18:27:38 UTC 2011
The branch "develop" has been updated.
The following is a summary of the commits.
from: 1960778fb792d6fa061ab03420e5ddb6cc0a273a
e4bb840 Merge branch 'master' into develop
466f2b7 There is no print view anymore.
334e1da Abstract MIME status block generation into separate object/class.
03dd213 [mms] Fix message redirection regression in dynamic view (Bug #10859).
7e12f2c Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
0255860 Merge branch 'master' into develop
fa7b0e5 Fix merge commit (I think)
-----------------------------------------------------------------------
commit e4bb840123218ddca26e61ad500d7ca55be8aed8
Merge: ea68918 9c16e32
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Dec 7 02:00:37 2011 -0700
Merge branch 'master' into develop
Conflicts:
imp/package.xml
.gitignore | 3 +-
framework/Crypt/lib/Horde/Crypt/Pgp.php | 9 +-
framework/Crypt/package.xml | 2 +
framework/Crypt/test/Horde/Crypt/PgpTest.php | 6 +-
framework/Db/test/Horde/Db/Adapter/Mysql/ColumnTest.php | 2 +-
framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 15 +
framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 15 +
framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 15 +
framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 15 +
framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 14 +
framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnTest.php | 2 +-
framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnTest.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Data/Envelope.php | 16 +-
framework/Imap_Client/package.xml | 6 +-
framework/Mime/lib/Horde/Mime/Headers.php | 89 +++-
framework/Mime/lib/Horde/Mime/Part.php | 35 +-
framework/Mime/package.xml | 18 +-
framework/Mime/test/Horde/Mime/PartTest.php | 6 +-
.../migration/Horde/Prefs/2_horde_prefs_upgrade_binary_value.php | 13 +
framework/Prefs/package.xml | 4 +-
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 111 +++++
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqlTest.php | 30 ++
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/MysqliTest.php | 30 ++
.../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/MysqlTest.php | 31 ++
.../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/PgsqlTest.php | 31 ++
.../Prefs/test/Horde/Prefs/Unit/Storage/Sql/Pdo/SqliteTest.php | 27 +
framework/Prefs/test/Horde/Prefs/conf.php.dist | 24 +
imp/docs/CHANGES | 4 +
imp/js/dimpbase.js | 1 +
imp/lib/Contents.php | 4 +-
imp/lib/Mime/Viewer/Pgp.php | 12 +
imp/package.xml | 4 +-
imp/search.php | 2 +-
imp/templates/dimp/index.inc | 8 +-
34 files changed, 537 insertions(+), 69 deletions(-)
http://git.horde.org/horde-git/-/commit/e4bb840123218ddca26e61ad500d7ca55be8aed8
-----------------------------------------------------------------------
commit 466f2b79afe21f5f36c1a13b067dc9c55ae343c0
Author: Jan Schneider <jan at horde.org>
Date: Tue Dec 13 17:40:00 2011 +0100
There is no print view anymore.
mnemo/templates/view/memo.inc | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/466f2b79afe21f5f36c1a13b067dc9c55ae343c0
-----------------------------------------------------------------------
commit 334e1da0f8dffbbb474a232ee142e3f7a9e4fcf5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 13 05:11:36 2011 -0700
Abstract MIME status block generation into separate object/class.
imp/lib/Contents.php | 79 ++++---------------
imp/lib/Mime/Status.php | 143 +++++++++++++++++++++++++++++++++++
imp/lib/Mime/Viewer/Alternative.php | 7 +-
imp/lib/Mime/Viewer/Appledouble.php | 14 ++--
imp/lib/Mime/Viewer/Audio.php | 12 +--
imp/lib/Mime/Viewer/Html.php | 70 +++++++----------
imp/lib/Mime/Viewer/Images.php | 26 ++-----
imp/lib/Mime/Viewer/Itip.php | 3 -
imp/lib/Mime/Viewer/Mdn.php | 12 +--
imp/lib/Mime/Viewer/Partial.php | 11 +--
imp/lib/Mime/Viewer/Pdf.php | 15 +---
imp/lib/Mime/Viewer/Pgp.php | 98 ++++++++++--------------
imp/lib/Mime/Viewer/Plain.php | 3 -
imp/lib/Mime/Viewer/Related.php | 24 +++---
imp/lib/Mime/Viewer/Smime.php | 56 ++++++--------
imp/lib/Mime/Viewer/Status.php | 30 +++-----
imp/lib/Mime/Viewer/Vcard.php | 1 -
imp/lib/Mime/Viewer/Video.php | 12 +--
imp/lib/Mime/Viewer/Zip.php | 1 -
imp/lib/Views/ShowMessage.php | 9 +--
imp/message.php | 11 +--
imp/package.xml | 4 +-
22 files changed, 323 insertions(+), 318 deletions(-)
create mode 100644 imp/lib/Mime/Status.php
http://git.horde.org/horde-git/-/commit/334e1da0f8dffbbb474a232ee142e3f7a9e4fcf5
-----------------------------------------------------------------------
commit 03dd213b5af9a5ccb37899801f4692f6944126e3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 13 11:02:31 2011 -0700
[mms] Fix message redirection regression in dynamic view (Bug #10859).
Sigh. This was all tested, and then I went and tried to simplify things
in dynamic view since it didn't support redirecting multiple messages
and that broke things.
So fix this correctly by having dynamic view support redirecting
multiple messages. Also, optimize by passing header/content information
back to allow further manipulation.
imp/compose-dimp.php | 2 +-
imp/compose-mimp.php | 2 +-
imp/compose.php | 4 ++--
imp/docs/CHANGES | 1 +
imp/js/compose-dimp.js | 7 ++++++-
imp/lib/Ajax/Application.php | 41 ++++++++++++++++++++++-------------------
imp/lib/Compose.php | 24 ++++++++++++++++++++----
imp/package.xml | 4 ++--
8 files changed, 55 insertions(+), 30 deletions(-)
http://git.horde.org/horde-git/-/commit/03dd213b5af9a5ccb37899801f4692f6944126e3
-----------------------------------------------------------------------
commit 7e12f2c1a93573669d3714180b808b120c6610a3
Merge: e4bb840 1960778
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 13 11:25:13 2011 -0700
Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
Conflicts:
imp/package.xml
agora/locale/lv/LC_MESSAGES/agora.mo | Bin 73150 -> 76038 bytes
agora/locale/lv/LC_MESSAGES/agora.po | 445 +-
ansel/locale/lv/LC_MESSAGES/ansel.mo | Bin 80610 -> 86375 bytes
ansel/locale/lv/LC_MESSAGES/ansel.po | 514 +-
beatnik/locale/lv/LC_MESSAGES/beatnik.mo | Bin 74296 -> 70270 bytes
beatnik/locale/lv/LC_MESSAGES/beatnik.po | 85 +-
beatnik/locale/lv/help.xml | 8 +-
bundles/groupware/docs/CHANGES | 130 +-
bundles/groupware/docs/RELEASE_NOTES | 37 +-
bundles/groupware/lib/Bundle.php | 2 +-
bundles/groupware/package.xml | 33 +-
bundles/webmail/docs/CHANGES | 164 +-
bundles/webmail/docs/RELEASE_NOTES | 55 +-
bundles/webmail/lib/Bundle.php | 2 +-
bundles/webmail/package.xml | 37 +-
chora/app/views/_logMessage.html.php | 23 +-
chora/browsedir.php | 3 +-
chora/browsefile.php | 8 +-
chora/lib/Application.php | 2 +-
chora/locale/lv/LC_MESSAGES/chora.mo | Bin 75351 -> 68979 bytes
chora/locale/nl/LC_MESSAGES/chora.mo | Bin 63091 -> 62839 bytes
chora/patchsets.php | 13 +-
chora/templates/checkout/checkout.inc | 2 +-
chora/templates/diff/header.inc | 2 +-
chora/templates/patchsets/ps_single.inc | 2 +-
content/lib/Objects/Object.php | 7 -
content/lib/Tagger.php | 13 +-
content/lib/Tags/Tag.php | 7 -
content/lib/Tags/TagMapper.php | 8 -
content/lib/Types/Manager.php | 9 -
content/lib/Users/Manager.php | 9 -
folks/locale/lv/LC_MESSAGES/folks.mo | Bin 78052 -> 71680 bytes
folks/locale/lv/LC_MESSAGES/folks.po | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Base.php | 55 +-
framework/ActiveSync/lib/Horde/ActiveSync/Timezone.php | 37 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php | 2 +
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 7 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 1 +
framework/ActiveSync/package.xml | 38 +-
framework/ActiveSync/test/Horde/ActiveSync/AppointmentTest.php | 83 +
framework/ActiveSync/test/Horde/ActiveSync/FileStateTest.php | 99 -
framework/ActiveSync/test/Horde/ActiveSync/TimezoneTest.php | 17 +-
.../ActiveSync/test/Horde/ActiveSync/fixtures/appointment.wbxml | Bin 0 -> 369 bytes
framework/Auth/locale/lv/LC_MESSAGES/Horde_Auth.mo | Bin 0 -> 3239 bytes
framework/Auth/locale/lv/LC_MESSAGES/Horde_Auth.po | 103 +
framework/Auth/package.xml | 29 +-
framework/Autoloader_Cache/lib/Horde/Autoloader/Cache.php | 32 +-
framework/Autoloader_Cache/package.xml | 23 +-
framework/Core/lib/Horde/Core/Factory/ActiveSyncServer.php | 10 +-
framework/Core/lib/Horde/Core/Factory/ElasticSearch.php | 42 +
framework/Core/lib/Horde/Core/Factory/Weather.php | 3 +-
framework/Core/lib/Horde/Registry.php | 1 +
framework/Core/package.xml | 27 +-
framework/Crypt/package.xml | 25 +-
framework/Date/lib/Horde/Date.php | 3 +-
framework/Date/package.xml | 23 +-
framework/Date/test/Horde/Date/DateTest.php | 43 +
framework/Db/lib/Horde/Db/Adapter/Base/Schema.php | 25 +
framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 22 +
framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 41 +
framework/Db/package.xml | 30 +-
framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 30 +
framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 30 +
framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 30 +
framework/Db/test/Horde/Db/Adapter/Pdo/PgsqlTest.php | 30 +
framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 39 +
framework/Image/locale/lv/LC_MESSAGES/Horde_Image.mo | Bin 6886 -> 7013 bytes
framework/Image/locale/lv/LC_MESSAGES/Horde_Image.po | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 +-
framework/Imap_Client/package.xml | 24 +-
framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Contact.php | 5 -
framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php | 9 +-
.../lib/Horde/Kolab/Format/Xml/Type/Composite/Recurrence/V1.php | 43 +
.../Kolab_Format/lib/Horde/Kolab/Format/Xml/Type/Date/V1.php | 90 +
.../lib/Horde/Kolab/Format/Xml/Type/RecurrenceRange/V1.php | 137 +
framework/Kolab_Format/package.xml | 22 +-
.../test/Horde/Kolab/Format/Integration/ContactTest.php | 26 -
framework/Mime/lib/Horde/Mime/Headers.php | 2 +
framework/Mime/package.xml | 28 +-
framework/Pear/lib/Horde/Pear/Package/Xml/Directory.php | 2 +-
framework/Prefs/lib/Horde/Prefs.php | 18 +-
framework/Prefs/package.xml | 44 +-
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 2 +-
framework/Push/locale/lv/LC_MESSAGES/Horde_Push.mo | Bin 0 -> 745 bytes
framework/Push/locale/lv/LC_MESSAGES/Horde_Push.po | 30 +
framework/Push/package.xml | 2 +
framework/Service_Weather/lib/Horde/Service/Weather/Base.php | 2 +-
.../lib/Horde/Service/Weather/WeatherUnderground.php | 9 +-
.../locale/lv/LC_MESSAGES/Horde_Service_Weather.mo | Bin 0 -> 639 bytes
.../locale/lv/LC_MESSAGES/Horde_Service_Weather.po | 34 +
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.mo | Bin 11809 -> 11806 bytes
.../locale/nl/LC_MESSAGES/Horde_Service_Weather.po | 14 +-
framework/Service_Weather/package.xml | 33 +-
framework/Test/lib/Horde/Test/Factory/Alarm.php | 44 +
framework/Test/lib/Horde/Test/Factory/Cache.php | 44 +
framework/Test/lib/Horde/Test/Factory/Session.php | 48 +
framework/Test/lib/Horde/Test/Stub/Registry.php | 23 +
framework/Test/package.xml | 36 +-
framework/Text_Filter/package.xml | 2 +-
framework/Vcs/lib/Horde/Vcs/Base.php | 4 +-
framework/Vcs/lib/Horde/Vcs/Directory/Base.php | 1 -
framework/Vcs/lib/Horde/Vcs/Directory/Cvs.php | 1 -
framework/Vcs/lib/Horde/Vcs/Directory/Git.php | 4 +-
framework/Vcs/lib/Horde/Vcs/Directory/Rcs.php | 4 +-
framework/Vcs/lib/Horde/Vcs/Directory/Svn.php | 5 +-
framework/Vcs/lib/Horde/Vcs/File/Base.php | 43 +-
framework/Vcs/lib/Horde/Vcs/File/Cvs.php | 9 +-
framework/Vcs/lib/Horde/Vcs/File/Git.php | 125 +-
framework/Vcs/lib/Horde/Vcs/File/Rcs.php | 76 +-
framework/Vcs/lib/Horde/Vcs/File/Svn.php | 92 +-
framework/Vcs/lib/Horde/Vcs/Git.php | 6 +-
framework/Vcs/lib/Horde/Vcs/Log/Base.php | 14 +
framework/Vcs/lib/Horde/Vcs/Log/Git.php | 101 +-
framework/Vcs/lib/Horde/Vcs/Log/Rcs.php | 2 +-
framework/Vcs/lib/Horde/Vcs/Log/Svn.php | 34 +-
framework/Vcs/lib/Horde/Vcs/Patchset/Base.php | 2 +
framework/Vcs/lib/Horde/Vcs/Patchset/Cvs.php | 7 +-
framework/Vcs/lib/Horde/Vcs/Patchset/Git.php | 15 +-
framework/Vcs/lib/Horde/Vcs/Patchset/Svn.php | 20 +-
framework/Vcs/lib/Horde/Vcs/QuickLog/Base.php | 115 +
framework/Vcs/lib/Horde/Vcs/QuickLog/Cvs.php | 17 +
framework/Vcs/lib/Horde/Vcs/QuickLog/Git.php | 45 +
framework/Vcs/lib/Horde/Vcs/QuickLog/Rcs.php | 17 +
framework/Vcs/lib/Horde/Vcs/QuickLog/Svn.php | 18 +
framework/Vcs/package.xml | 32 +-
framework/Vcs/test/Horde/Vcs/CvsTest.php | 83 +-
framework/Vcs/test/Horde/Vcs/GitTest.php | 104 +-
framework/Vcs/test/Horde/Vcs/RcsTest.php | 15 +-
framework/Vcs/test/Horde/Vcs/SvnTest.php | 53 +-
gollem/locale/lv/LC_MESSAGES/gollem.mo | Bin 79055 -> 72715 bytes
gollem/locale/nl/LC_MESSAGES/gollem.mo | Bin 65743 -> 65499 bytes
hermes/locale/lv/LC_MESSAGES/hermes.mo | Bin 76594 -> 70397 bytes
hermes/locale/lv/LC_MESSAGES/hermes.po | 8 +-
hermes/locale/lv/help.xml | 18 +-
horde/config/conf.xml | 16 +-
horde/docs/CHANGES | 10 +-
horde/docs/CREDITS | 2 +-
horde/docs/RELEASE_NOTES | 12 +-
horde/lib/Block/Weather.php | 16 +-
horde/locale/lv/LC_MESSAGES/horde.mo | Bin 70924 -> 64600 bytes
horde/locale/lv/LC_MESSAGES/horde.po | 646 +--
horde/locale/nl/LC_MESSAGES/horde.mo | Bin 56105 -> 55837 bytes
horde/locale/nl/LC_MESSAGES/horde.po | 140 +-
horde/package.xml | 25 +-
imp/docs/CHANGES | 9 +-
imp/docs/RELEASE_NOTES | 25 +-
imp/js/dimpbase.js | 60 +-
imp/js/mailbox.js | 7 +-
imp/lib/Ajax/Application.php | 3 -
imp/lib/Mailbox/List.php | 2 +-
imp/lib/Message.php | 3 +
imp/lib/Ui/Message.php | 4 +-
imp/lib/Views/ListMessages.php | 14 +-
imp/locale/lv/LC_MESSAGES/imp.mo | Bin 185393 -> 179076 bytes
imp/locale/lv/LC_MESSAGES/imp.po | 4 +-
imp/locale/lv/help.xml | 1632 +++--
imp/locale/nl/LC_MESSAGES/imp.mo | Bin 156724 -> 156465 bytes
imp/mailbox.php | 2 +-
imp/package.xml | 20 +-
ingo/docs/CHANGES | 8 +-
ingo/docs/RELEASE_NOTES | 12 +-
ingo/locale/lv/LC_MESSAGES/ingo.mo | Bin 88250 -> 81862 bytes
ingo/locale/lv/help.xml | 8 +-
ingo/locale/nl/LC_MESSAGES/ingo.mo | Bin 73372 -> 73168 bytes
ingo/package.xml | 21 +-
jonah/locale/lv/LC_MESSAGES/jonah.mo | Bin 78682 -> 72310 bytes
jonah/locale/lv/help.xml | 6 +-
jonah/locale/nl/LC_MESSAGES/jonah.mo | Bin 72653 -> 72313 bytes
klutz/locale/lv/LC_MESSAGES/klutz.mo | Bin 73916 -> 67794 bytes
klutz/locale/lv/LC_MESSAGES/klutz.po | 26 +-
kronolith/config/prefs.php | 2 +-
kronolith/docs/CHANGES | 13 +-
kronolith/docs/RELEASE_NOTES | 16 +-
kronolith/lib/Calendars/Base.php | 70 +
kronolith/lib/Calendars/Default.php | 48 +
kronolith/lib/Calendars/Kolab.php | 23 +
kronolith/lib/Driver/Kolab.php | 38 +-
kronolith/lib/Driver/Sql.php | 6 +-
kronolith/lib/Event/Kolab.php | 46 +-
kronolith/lib/Factory/Calendars.php | 69 +
kronolith/lib/Kronolith.php | 13 +-
kronolith/locale/lv/LC_MESSAGES/kronolith.mo | Bin 130810 -> 124457 bytes
kronolith/locale/lv/LC_MESSAGES/kronolith.po | 706 +-
kronolith/locale/lv/help.xml | 103 +-
kronolith/locale/nl/LC_MESSAGES/kronolith.mo | Bin 91659 -> 91352 bytes
kronolith/migration/3_kronolith_upgrade_addallday.php | 2 +-
kronolith/package.xml | 79 +-
kronolith/templates/index/index.inc | 6 +-
kronolith/test/Kronolith/Autoload.php | 7 +
kronolith/test/Kronolith/Integration/Driver/Base.php | 139 +
kronolith/test/Kronolith/Integration/Driver/KolabTest.php | 47 +
kronolith/test/Kronolith/Integration/Driver/Sql/Base.php | 45 +
.../test/Kronolith/Integration/Driver/Sql/Pdo/SqliteTest.php | 62 +
kronolith/test/Kronolith/Integration/Kronolith/Base.php | 110 +
kronolith/test/Kronolith/Integration/Kronolith/KolabTest.php | 52 +
kronolith/test/Kronolith/Integration/Kronolith/Sql/Base.php | 45 +
.../test/Kronolith/Integration/Kronolith/Sql/Pdo/SqliteTest.php | 58 +
kronolith/test/Kronolith/Stub/ShareFactory.php | 16 +
kronolith/test/Kronolith/Stub/Tagger.php | 17 +
kronolith/test/Kronolith/Stub/Types.php | 8 +
kronolith/test/Kronolith/TestCase.php | 151 +-
kronolith/test/Kronolith/Unit/KolabTest.php | 83 -
luxor/locale/lv/LC_MESSAGES/luxor.mo | Bin 72739 -> 66383 bytes
mnemo/docs/CHANGES | 9 +-
mnemo/docs/RELEASE_NOTES | 10 +-
mnemo/lib/Mnemo.php | 18 +-
mnemo/locale/lv/LC_MESSAGES/mnemo.mo | Bin 80916 -> 74536 bytes
mnemo/locale/lv/help.xml | 10 +-
mnemo/locale/nl/LC_MESSAGES/mnemo.mo | Bin 64926 -> 64674 bytes
mnemo/package.xml | 22 +-
nag/docs/CHANGES | 9 +-
nag/docs/RELEASE_NOTES | 14 +-
nag/lib/Form/Type/NagMethod.php | 3 -
nag/lib/Ui/VarRenderer/Nag.php | 49 +-
nag/locale/lv/LC_MESSAGES/nag.mo | Bin 95035 -> 89095 bytes
nag/locale/lv/LC_MESSAGES/nag.po | 295 +-
nag/locale/lv/help.xml | 6 +-
nag/locale/nl/LC_MESSAGES/nag.mo | Bin 73425 -> 73197 bytes
nag/package.xml | 20 +-
passwd/locale/lv/LC_MESSAGES/passwd.mo | Bin 79991 -> 73571 bytes
passwd/locale/lv/help.xml | 16 +-
passwd/locale/nl/LC_MESSAGES/passwd.mo | Bin 58420 -> 58144 bytes
sam/locale/lv/LC_MESSAGES/sam.mo | Bin 73989 -> 67521 bytes
sesha/locale/lv/LC_MESSAGES/sesha.mo | Bin 76771 -> 70399 bytes
timeobjects/docs/CHANGES | 9 +-
timeobjects/lib/Application.php | 2 +-
timeobjects/lib/Driver/Weather.php | 2 +-
timeobjects/locale/lv/LC_MESSAGES/timeobjects.mo | Bin 71598 -> 66193 bytes
timeobjects/locale/nl/LC_MESSAGES/timeobjects.mo | Bin 0 -> 56418 bytes
timeobjects/locale/nl/LC_MESSAGES/timeobjects.po | 72 +
timeobjects/package.xml | 32 +-
trean/lib/Bookmark.php | 9 +-
trean/lib/Bookmarks.php | 6 +-
trean/locale/lv/LC_MESSAGES/trean.mo | Bin 81362 -> 74990 bytes
trean/locale/nl/LC_MESSAGES/trean.mo | Bin 67079 -> 66875 bytes
turba/locale/lv/LC_MESSAGES/turba.mo | Bin 101035 -> 95011 bytes
turba/locale/lv/LC_MESSAGES/turba.po | 133 +-
turba/locale/lv/help.xml | 10 +-
turba/locale/nl/LC_MESSAGES/turba.mo | Bin 82475 -> 82232 bytes
ulaform/locale/lv/LC_MESSAGES/ulaform.mo | Bin 76052 -> 69680 bytes
ulaform/locale/lv/help.xml | 4 +-
vilma/locale/lv/LC_MESSAGES/vilma.mo | Bin 78083 -> 72011 bytes
vilma/locale/lv/LC_MESSAGES/vilma.po | 13 +-
whups/bin/whups-bugzilla-import | 9 +-
whups/bin/whups-convert-sql-shares-to-sqlng | 9 +-
whups/bin/whups-git-hook | 8 +-
whups/bin/whups-mail-filter | 9 +-
whups/bin/whups-reminders | 9 +-
whups/bin/whups-svn-hook | 8 +-
whups/docs/CHANGES | 9 +-
whups/docs/INSTALL | 42 +-
whups/docs/RELEASE_NOTES | 24 +-
whups/lib/Application.php | 2 +-
whups/locale/lv/LC_MESSAGES/whups.mo | Bin 89138 -> 87735 bytes
whups/locale/lv/LC_MESSAGES/whups.po | 409 +-
whups/locale/lv/help.xml | 4 +-
whups/locale/nl/LC_MESSAGES/whups.mo | Bin 89105 -> 88901 bytes
whups/package.xml | 40 +-
wicked/docs/CHANGES | 8 +-
wicked/docs/RELEASE_NOTES | 9 +-
wicked/lib/Application.php | 2 +-
wicked/locale/lv/LC_MESSAGES/wicked.mo | Bin 71197 -> 69243 bytes
wicked/locale/lv/LC_MESSAGES/wicked.po | 305 +-
wicked/locale/lv/help.xml | 6 +-
wicked/package.xml | 29 +-
265 files changed, 6579 insertions(+), 4424 deletions(-)
http://git.horde.org/horde-git/-/commit/7e12f2c1a93573669d3714180b808b120c6610a3
-----------------------------------------------------------------------
commit 0255860ed6f748439491a8bcfda0bc6a3128dfbd
Merge: 7e12f2c 03dd213
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 13 11:26:00 2011 -0700
Merge branch 'master' into develop
Conflicts:
imp/compose-dimp.php
imp/package.xml
imp/compose-dimp.php | 2 +-
imp/compose-mimp.php | 2 +-
imp/compose.php | 4 +-
imp/docs/CHANGES | 1 +
imp/js/compose-dimp.js | 7 ++-
imp/lib/Ajax/Application.php | 41 ++++++-----
imp/lib/Compose.php | 24 +++++-
imp/lib/Contents.php | 79 ++++---------------
imp/lib/Mime/Status.php | 143 +++++++++++++++++++++++++++++++++++
imp/lib/Mime/Viewer/Alternative.php | 7 +-
imp/lib/Mime/Viewer/Appledouble.php | 14 ++--
imp/lib/Mime/Viewer/Audio.php | 12 +--
imp/lib/Mime/Viewer/Html.php | 70 +++++++----------
imp/lib/Mime/Viewer/Images.php | 26 ++-----
imp/lib/Mime/Viewer/Itip.php | 3 -
imp/lib/Mime/Viewer/Mdn.php | 12 +--
imp/lib/Mime/Viewer/Partial.php | 11 +--
imp/lib/Mime/Viewer/Pdf.php | 15 +---
imp/lib/Mime/Viewer/Pgp.php | 98 ++++++++++--------------
imp/lib/Mime/Viewer/Plain.php | 3 -
imp/lib/Mime/Viewer/Related.php | 24 +++---
imp/lib/Mime/Viewer/Smime.php | 56 ++++++--------
imp/lib/Mime/Viewer/Status.php | 30 +++-----
imp/lib/Mime/Viewer/Vcard.php | 1 -
imp/lib/Mime/Viewer/Video.php | 12 +--
imp/lib/Mime/Viewer/Zip.php | 1 -
imp/lib/Views/ShowMessage.php | 9 +--
imp/message.php | 11 +--
imp/package.xml | 6 +-
mnemo/templates/view/memo.inc | 14 ++--
30 files changed, 383 insertions(+), 355 deletions(-)
http://git.horde.org/horde-git/-/commit/0255860ed6f748439491a8bcfda0bc6a3128dfbd
-----------------------------------------------------------------------
commit fa7b0e5978832e98e39182f6e98b613d6129f9cc
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 13 11:27:16 2011 -0700
Fix merge commit (I think)
imp/js/dimpbase.js | 33 ---------------------------------
1 files changed, 0 insertions(+), 33 deletions(-)
http://git.horde.org/horde-git/-/commit/fa7b0e5978832e98e39182f6e98b613d6129f9cc
More information about the commits
mailing list