[commits] Horde branch imp_6_2 updated. 20e47d81d57721a14f3bf99c0e193ee3c33c6bc8
Jan Schneider
jan at horde.org
Fri Oct 25 15:51:06 UTC 2013
The branch "imp_6_2" has been updated.
The following is a summary of the commits.
from: 7ecbc62b8d85ccbabcce77bfa242fafcb2c77586
26356b8 Convert plain text signature to textarea.
2f0ca5a We have that value already.
5bff52a Merge remote-tracking branch 'origin/master' into signatures
8ce53b8 Merge branch 'imp_6_2' into signatures
0ee865c Merge remote-tracking branch 'origin/master' into signatures
dcc5faf No need to authenticate, just load the language.
07aa99d Merge branch 'imp_6_2' into signatures
96ef24d [jan] Don't show admin alarm form if alarms are disabled.
5490361 Load HTML editor.
c5ebded Send signature.
c1128ab Merge branch 'master' into imp_6_2
e793711 Merge branch 'imp_6_2' into signatures
439b253 Update changelog.
ae6e5bc Merge branch 'imp_6_2' into signatures
cf0cc20 Fix undefined variable.
5f224b0 Update HTML signature if changing identities.
9a9448c Implement editing in basic view.
20e47d8 Fix
Summary: http://github.com/horde/horde/compare/7ecbc62b8d85ccbabcce77bfa242fafcb2c77586...20e47d81d57721a14f3bf99c0e193ee3c33c6bc8
-----------------------------------------------------------------------
commit 26356b8e3f86ef236210026d2b178c1a2b61f61a
Author: Jan Schneider <jan at horde.org>
Date: Thu Oct 17 16:49:47 2013 +0200
Convert plain text signature to textarea.
imp/lib/Compose/Ui.php | 9 +--------
imp/templates/dynamic/compose.html.php | 4 +++-
imp/themes/default/basic/screen.css | 2 +-
imp/themes/default/dynamic/screen.css | 2 +-
imp/themes/default/screen.css | 16 ++++++++++------
5 files changed, 16 insertions(+), 17 deletions(-)
http://github.com/horde/horde/commit/26356b8e3f86ef236210026d2b178c1a2b61f61a
http://git.horde.org/horde-git/-/commit/26356b8e3f86ef236210026d2b178c1a2b61f61a
-----------------------------------------------------------------------
commit 2f0ca5a8ad97307d7cbc867544688e0a24cee92f
Author: Jan Schneider <jan at horde.org>
Date: Thu Oct 17 17:25:29 2013 +0200
We have that value already.
imp/lib/Editor.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/2f0ca5a8ad97307d7cbc867544688e0a24cee92f
http://git.horde.org/horde-git/-/commit/2f0ca5a8ad97307d7cbc867544688e0a24cee92f
-----------------------------------------------------------------------
commit 5bff52ad04a539d761a799d6ce07524feb53226d
Merge: 2f0ca5a 691d36f
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 18 13:08:36 2013 +0200
Merge remote-tracking branch 'origin/master' into signatures
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 +-
framework/Icalendar/package.xml | 1 -
framework/ListHeaders/lib/Horde/ListHeaders.php | 20 +
framework/ListHeaders/lib/Horde/ListHeaders/Translation.php | 57 +
framework/ListHeaders/locale/Horde_ListHeaders.pot | 46 +
framework/ListHeaders/package.xml | 32 +-
framework/Mime/lib/Horde/Mime/Headers.php | 2 +
framework/Timezone/lib/Horde/Timezone.php | 2 +-
framework/Timezone/lib/Horde/Timezone/Rule.php | 59 +-
framework/Timezone/lib/Horde/Timezone/Zone.php | 3 +-
framework/Timezone/package.xml | 21 +-
framework/Timezone/test/Horde/Timezone/IcalendarTest.php | 9 +
framework/Timezone/test/Horde/Timezone/fixtures/europe.ics | 561 ++++----
framework/Timezone/test/Horde/Timezone/fixtures/losangeles.ics | 122 ++
framework/Timezone/test/Horde/Timezone/fixtures/northamerica | 27 +
horde/docs/INSTALL | 24 +-
horde/services/twitter/index.php | 2 +-
17 files changed, 652 insertions(+), 339 deletions(-)
http://github.com/horde/horde/commit/5bff52ad04a539d761a799d6ce07524feb53226d
http://git.horde.org/horde-git/-/commit/5bff52ad04a539d761a799d6ce07524feb53226d
-----------------------------------------------------------------------
commit 8ce53b8813bb4f612c28d30ee6fbf9130f45fa2f
Merge: 5bff52a c0caa8a
Author: Jan Schneider <jan at horde.org>
Date: Tue Oct 22 17:03:30 2013 +0200
Merge branch 'imp_6_2' into signatures
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 2 +-
framework/Alarm/lib/Horde/Alarm/Sql.php | 4 +-
framework/Alarm/package.xml | 20 +-
framework/Core/package.xml | 23 +-
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 9 +
framework/Imap_Client/lib/Horde/Imap/Client/Password/Xoauth2.php | 71 +++
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 38 +-
framework/Imap_Client/package.xml | 12 +-
framework/Smtp/composer.json | 3 +-
framework/Smtp/lib/Horde/Smtp/Filter/Data.php | 2 +-
framework/Smtp/package.xml | 21 +-
framework/Smtp/test/Horde/Smtp/FilterDataTest.php | 53 ++
framework/Socket_Client/composer.json | 29 ++
framework/Socket_Client/package.xml | 21 +-
framework/Test/lib/Horde/Test/Autoload.php | 2 +-
framework/Test/package.xml | 4 +-
framework/admintools/README | 25 -
framework/admintools/composer.json | 30 --
framework/admintools/horde-base.php | 13 -
framework/admintools/horde-remove-pref.php | 52 --
framework/admintools/horde-sql-shell.php | 33 --
framework/admintools/package.xml | 97 ----
horde/bin/horde-pref-remove.php | 53 ++
horde/bin/horde-remove-user-data | 54 ++
horde/bin/horde-sql-shell.php | 42 ++
horde/docs/CHANGES | 1 +
horde/docs/INSTALL | 6 +-
horde/login.php | 4 +
horde/package.xml | 12 +-
imp/basic.php | 8 +-
imp/config/hooks.php.dist | 22 +
imp/docs/CHANGES | 2 +
imp/docs/UPGRADING | 8 +
imp/js/dimpbase.js | 17 +-
imp/lib/Ajax/Application/Handler/Common.php | 10 +-
imp/lib/Api.php | 3 +-
imp/lib/Basic/Listinfo.php | 136 ++++++
imp/lib/Basic/Message.php | 90 +---
imp/lib/Compose.php | 45 ++-
imp/lib/Compose/Exception/Address.php | 54 ++-
imp/lib/Dynamic/Mailbox.php | 4 +-
imp/lib/Dynamic/Message.php | 12 +-
imp/package.xml | 4 +-
imp/templates/dynamic/message.html.php | 8 +
imp/templates/listinfo/listinfo.html.php | 14 +
imp/themes/default/dynamic/screen.css | 14 +-
imp/themes/default/screen.css | 11 +-
47 files changed, 776 insertions(+), 422 deletions(-)
http://github.com/horde/horde/commit/8ce53b8813bb4f612c28d30ee6fbf9130f45fa2f
http://git.horde.org/horde-git/-/commit/8ce53b8813bb4f612c28d30ee6fbf9130f45fa2f
-----------------------------------------------------------------------
commit 0ee865c2d406b45da172f27282b4849fe0685e8d
Merge: 8ce53b8 3af5f94
Author: Jan Schneider <jan at horde.org>
Date: Wed Oct 23 16:29:33 2013 +0200
Merge remote-tracking branch 'origin/master' into signatures
Conflicts:
imp/package.xml
framework/ActiveSync/lib/Horde/ActiveSync.php | 92 +-
framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 19 +-
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 21 +-
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 14 +-
framework/ActiveSync/lib/Horde/ActiveSync/Device.php | 28 +-
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 28 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php | 41 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 10 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 162 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/Autodiscover.php | 16 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 5 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php | 1 -
framework/ActiveSync/lib/Horde/ActiveSync/Request/Provision.php | 8 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 47 +-
framework/ActiveSync/lib/Horde/ActiveSync/Rfc822.php | 21 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 521 ++-
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 1458 +++++
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 509 +--
framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 138 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 41 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 33 +-
framework/ActiveSync/package.xml | 40 +-
framework/ActiveSync/test/Horde/ActiveSync/AutodiscoverTest.php | 8 +-
framework/ActiveSync/test/Horde/ActiveSync/CacheTest.php | 2 +-
framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 78 +-
.../ActiveSync/test/Horde/ActiveSync/StateTest/Mongo/BaseTest.php | 240 +
framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php | 8 +
framework/Date/lib/Horde/Date.php | 118 +
framework/Smtp/composer.json | 4 +-
framework/Smtp/lib/Horde/Smtp/Filter/Data.php | 11 +-
framework/Smtp/package.xml | 19 +-
framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php | 19 +
horde/config/registry.php | 1 +
horde/lib/Test.php | 19 +
imp/docs/CHANGES | 2 +
imp/lib/Compose/LinkedAttachment.php | 9 +-
imp/package.xml | 1 +
kronolith/js/smartmobile.js | 14 +-
39 files changed, 3071 insertions(+), 741 deletions(-)
http://github.com/horde/horde/commit/0ee865c2d406b45da172f27282b4849fe0685e8d
http://git.horde.org/horde-git/-/commit/0ee865c2d406b45da172f27282b4849fe0685e8d
-----------------------------------------------------------------------
commit dcc5faf4a29267d360caae500f9ab57a868eadcc
Author: Jan Schneider <jan at horde.org>
Date: Wed Oct 23 16:35:29 2013 +0200
No need to authenticate, just load the language.
imp/lib/Compose/LinkedAttachment.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/dcc5faf4a29267d360caae500f9ab57a868eadcc
http://git.horde.org/horde-git/-/commit/dcc5faf4a29267d360caae500f9ab57a868eadcc
-----------------------------------------------------------------------
commit 07aa99de6e6362be6c96249f4eb2d59d7c41093e
Merge: dcc5faf 94ce7a7
Author: Jan Schneider <jan at horde.org>
Date: Thu Oct 24 16:12:00 2013 +0200
Merge branch 'imp_6_2' into signatures
.travis.yml | 2 +-
framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php | 5 +-
framework/Auth/test/Horde/Auth/Unit/Sql/Base.php | 5 +-
framework/Css_Parser/composer.json | 2 +-
framework/Css_Parser/lib/Sabberworm/CSS/Parser.php | 28 +++--
framework/Css_Parser/package.xml | 19 +++-
framework/Group/test/Horde/Group/Sql/Base.php | 5 +-
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 5 +-
framework/Rdo/test/Horde/Rdo/Sql/Base.php | 1 +
.../SessionHandler/test/Horde/SessionHandler/Storage/Sql/Base.php | 5 +-
framework/Share/test/Horde/Share/Sql/Base.php | 1 +
framework/Share/test/Horde/Share/Sqlng/Base.php | 1 +
framework/Text_Filter/composer.json | 2 +-
.../Text_Filter/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php | 28 ++++-
framework/Text_Filter/package.xml | 19 +++-
framework/Text_Filter/test/Horde/Text/Filter/JsminTest.php | 10 ++
framework/Vfs/test/Horde/Vfs/Sql/Base.php | 5 +-
framework/Vfs/test/Horde/Vfs/SqlFile/Base.php | 1 +
horde/templates/login/login.inc | 2 +-
horde/templates/login/smartmobile.html.php | 2 +-
kronolith/locale/de/LC_MESSAGES/kronolith.po | 4 +-
kronolith/templates/smartmobile/month.html.php | 2 +-
22 files changed, 119 insertions(+), 35 deletions(-)
http://github.com/horde/horde/commit/07aa99de6e6362be6c96249f4eb2d59d7c41093e
http://git.horde.org/horde-git/-/commit/07aa99de6e6362be6c96249f4eb2d59d7c41093e
-----------------------------------------------------------------------
commit 96ef24d9d40697627a9c471b6d9045a885feec0a
Author: Jan Schneider <jan at horde.org>
Date: Thu Oct 24 18:43:58 2013 +0200
[jan] Don't show admin alarm form if alarms are disabled.
horde/admin/alarms.php | 45 ++++++++++++++++++++++++++-------------------
horde/docs/CHANGES | 1 +
horde/package.xml | 2 ++
3 files changed, 29 insertions(+), 19 deletions(-)
http://github.com/horde/horde/commit/96ef24d9d40697627a9c471b6d9045a885feec0a
http://git.horde.org/horde-git/-/commit/96ef24d9d40697627a9c471b6d9045a885feec0a
-----------------------------------------------------------------------
commit 54903610f4475c81549417d4fa789ee0f7616a46
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 14:29:35 2013 +0200
Load HTML editor.
framework/Editor/js/ckeditor/nomargin.css | 4 +++
framework/Editor/package.xml | 7 +++--
imp/js/compose-base.js | 35 +++++++++++++++++++++-------
imp/js/compose-dimp.js | 3 ++
imp/themes/default/screen.css | 4 +++
5 files changed, 41 insertions(+), 12 deletions(-)
create mode 100644 framework/Editor/js/ckeditor/nomargin.css
http://github.com/horde/horde/commit/54903610f4475c81549417d4fa789ee0f7616a46
http://git.horde.org/horde-git/-/commit/54903610f4475c81549417d4fa789ee0f7616a46
-----------------------------------------------------------------------
commit c5ebded9d0f332644fd728e264e2e864cbb8f4c2
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:22:55 2013 +0200
Send signature.
imp/js/compose-base.js | 4 +
imp/lib/Ajax/Application/Handler/Common.php | 1 +
imp/lib/Compose.php | 90 ++++++++++++---------------
3 files changed, 44 insertions(+), 51 deletions(-)
http://github.com/horde/horde/commit/c5ebded9d0f332644fd728e264e2e864cbb8f4c2
http://git.horde.org/horde-git/-/commit/c5ebded9d0f332644fd728e264e2e864cbb8f4c2
-----------------------------------------------------------------------
commit c1128abe575c1fe1e5d8f7f74cb4b41ddfbe8304
Merge: 94ce7a7 0d25249
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:23:55 2013 +0200
Merge branch 'master' into imp_6_2
horde/admin/alarms.php | 45 ++++++++++++++++++++++++++-------------------
horde/docs/CHANGES | 1 +
horde/package.xml | 2 ++
3 files changed, 29 insertions(+), 19 deletions(-)
http://github.com/horde/horde/commit/c1128abe575c1fe1e5d8f7f74cb4b41ddfbe8304
http://git.horde.org/horde-git/-/commit/c1128abe575c1fe1e5d8f7f74cb4b41ddfbe8304
-----------------------------------------------------------------------
commit e79371101c27138865f32ad28a1014133db67424
Merge: c5ebded c1128ab
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:24:03 2013 +0200
Merge branch 'imp_6_2' into signatures
http://github.com/horde/horde/commit/e79371101c27138865f32ad28a1014133db67424
http://git.horde.org/horde-git/-/commit/e79371101c27138865f32ad28a1014133db67424
-----------------------------------------------------------------------
commit 439b2537cb4036b955e707a09f9fc02e602413e2
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:25:22 2013 +0200
Update changelog.
imp/docs/CHANGES | 2 +-
imp/package.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/439b2537cb4036b955e707a09f9fc02e602413e2
http://git.horde.org/horde-git/-/commit/439b2537cb4036b955e707a09f9fc02e602413e2
-----------------------------------------------------------------------
commit ae6e5bcdb3b0c13ca334b9a6015a6eec8c666b6d
Merge: 439b253 7ecbc62
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:28:32 2013 +0200
Merge branch 'imp_6_2' into signatures
framework/Core/js/prototype.js | 2 +-
framework/Core/package.xml | 4 +-
framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +-
framework/Prefs/package.xml | 4 +-
framework/Socket_Client/doc/Horde/Socket/Client/UPGRADING | 21 +++++++++++++
framework/Socket_Client/lib/Horde/Socket/Client.php | 14 +++++---
framework/Socket_Client/package.xml | 10 ++++--
imp/js/compose-dimp.js | 12 ++++---
imp/js/compose.js | 2 +-
imp/js/dimpbase.js | 2 +
imp/js/prettyautocomplete.js | 10 ++----
11 files changed, 56 insertions(+), 27 deletions(-)
http://github.com/horde/horde/commit/ae6e5bcdb3b0c13ca334b9a6015a6eec8c666b6d
http://git.horde.org/horde-git/-/commit/ae6e5bcdb3b0c13ca334b9a6015a6eec8c666b6d
-----------------------------------------------------------------------
commit cf0cc2018ccf8873f4c45e2f2ddd508642b0fb30
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 15:51:04 2013 +0200
Fix undefined variable.
hermes/lib/Driver/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/cf0cc2018ccf8873f4c45e2f2ddd508642b0fb30
http://git.horde.org/horde-git/-/commit/cf0cc2018ccf8873f4c45e2f2ddd508642b0fb30
-----------------------------------------------------------------------
commit 5f224b0d7b7dbbd85798e7367bc3296adbe98860
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 17:43:18 2013 +0200
Update HTML signature if changing identities.
imp/js/compose-base.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
http://github.com/horde/horde/commit/5f224b0d7b7dbbd85798e7367bc3296adbe98860
http://git.horde.org/horde-git/-/commit/5f224b0d7b7dbbd85798e7367bc3296adbe98860
-----------------------------------------------------------------------
commit 9a9448c0eaac4aedf3617586b54915d2847f9131
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 17:43:56 2013 +0200
Implement editing in basic view.
imp/js/compose-base.js | 6 ++----
imp/lib/Basic/Compose.php | 1 +
imp/lib/Compose.php | 2 +-
imp/templates/basic/compose/compose.html.php | 4 +++-
imp/templates/dynamic/compose.html.php | 2 +-
imp/themes/default/basic/screen.css | 10 +++++++++-
imp/themes/default/dynamic/screen.css | 7 +++++++
imp/themes/default/screen.css | 7 -------
8 files changed, 24 insertions(+), 15 deletions(-)
http://github.com/horde/horde/commit/9a9448c0eaac4aedf3617586b54915d2847f9131
http://git.horde.org/horde-git/-/commit/9a9448c0eaac4aedf3617586b54915d2847f9131
-----------------------------------------------------------------------
commit 20e47d81d57721a14f3bf99c0e193ee3c33c6bc8
Author: Jan Schneider <jan at horde.org>
Date: Fri Oct 25 17:44:27 2013 +0200
Fix
imp/locale/de/LC_MESSAGES/imp.po | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/20e47d81d57721a14f3bf99c0e193ee3c33c6bc8
http://git.horde.org/horde-git/-/commit/20e47d81d57721a14f3bf99c0e193ee3c33c6bc8
More information about the commits
mailing list