[commits] Horde branch master updated. b9c460cc38ccdb2497c9155b71fb7471d25d6717

Michael J. Rubinsky mrubinsk at horde.org
Thu Oct 18 23:14:21 UTC 2012


The branch "master" has been updated.
The following is a summary of the commits.

from: 5cf21a3608adbcb1c033f69a7d6172b814bcaa56

73773e7 First round of refactoring for Hermes for new Ajax framework and UI.
1785bfd Fix graphic locations.
db55980 Remove minical code/UI for now.
f3ac7b2 Merge branch 'master' into hermes
9c258a9 Bug: 11407 Only show feed link when we need to.
2b7f54c Use a header div for now here.
f500e16 Tweak time entry form, css, remove unused classes etc...
91581fd Use horde-collapse
b7c2a8d Unused
6781888 Removed commented out code.
13c2d71 tweak css rules, move spinner.
5d9e095 More js/html/css cleanup.
2c9dfdf Remove unnecessary div and css class
bed93a7 Remove unnecessary CSS class.
022ee13 Add graphics to topbar buttons.
173be30 Merge branch 'master' into hermes
6d5a154 Not needed.
4b85627 Bug: 11532 Use default parameter values.
48805a6 Merge branch 'master' into hermes
1311225 More interface fixes. Move old HermesNav stuff to sidebar
7c39a74 Add some new icons
16a0392 Not used.
adf3822 Merge branch 'master' into hermes
afc5c82 Unused.
a59bba9 Merge branch 'master' into hermes
c1bdcf4 Clean up clickHandler a bit.
35019a8 Start fixing timers.
4921a36 More UI fixes.
b48a27f Move the quickAdd CSS rules to horde.
337b5cf Merge branch 'master' into hermes
853a1b8 Remove cruft
07fba6f Fix new timer creation.
a92b85e This has it's own dom id now.
9a44709 Fix timer start/pausing
c2ed0f0 Fix Horde_Calendar usage
415a680 CSS cleanup
99039bf No rounded css anymore.
480fd52 Clean up edit/delete links for slices.
b9c460c Add new graphics

-----------------------------------------------------------------------

commit 73773e7bc1d65ddaf55f05e199c202b8211a6ee6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 17:28:21 2012 -0400

    First round of refactoring for Hermes for new Ajax framework and UI.

 hermes/index.php                          |    8 +-
 hermes/lib/Ajax.php                       |   12 +-
 hermes/lib/Application.php                |    8 +
 hermes/lib/View/Sidebar.php               |   52 +++++
 hermes/package.xml                        |   22 ++-
 hermes/templates/dynamic/index.inc        |   42 ++++
 hermes/templates/dynamic/search.inc       |   80 +++++++
 hermes/templates/dynamic/sidebar.html.php |   24 ++
 hermes/templates/dynamic/timeedit.inc     |   87 +++++++
 hermes/templates/dynamic/timer.inc        |   14 ++
 hermes/templates/index/index.inc          |  120 ----------
 hermes/templates/index/search.inc         |   80 -------
 hermes/templates/index/timeedit.inc       |   87 -------
 hermes/templates/index/timer.inc          |   14 --
 hermes/themes/default/dynamic/screen.css  |  354 ++--------------------------
 15 files changed, 359 insertions(+), 645 deletions(-)
 create mode 100644 hermes/lib/View/Sidebar.php
 create mode 100644 hermes/templates/dynamic/index.inc
 create mode 100644 hermes/templates/dynamic/search.inc
 create mode 100644 hermes/templates/dynamic/sidebar.html.php
 create mode 100644 hermes/templates/dynamic/timeedit.inc
 create mode 100644 hermes/templates/dynamic/timer.inc
 delete mode 100644 hermes/templates/index/index.inc
 delete mode 100644 hermes/templates/index/search.inc
 delete mode 100644 hermes/templates/index/timeedit.inc
 delete mode 100644 hermes/templates/index/timer.inc

http://git.horde.org/horde-git/-/commit/73773e7bc1d65ddaf55f05e199c202b8211a6ee6

-----------------------------------------------------------------------

commit 1785bfdd7affd204918a16e369465e4269e04696
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 17:37:27 2012 -0400

    Fix graphic locations.

 hermes/themes/default/dynamic/screen.css |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/1785bfdd7affd204918a16e369465e4269e04696

-----------------------------------------------------------------------

commit db559800502e13b860dfe1338d1eb5591e66b82a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 17:37:43 2012 -0400

    Remove minical code/UI for now.
    
    Was not being used, and probably won't be implemented for some time.

 hermes/js/hermes.js |   83 ---------------------------------------------------
 1 files changed, 0 insertions(+), 83 deletions(-)

http://git.horde.org/horde-git/-/commit/db559800502e13b860dfe1338d1eb5591e66b82a

-----------------------------------------------------------------------

commit f3ac7b28be700d3b73733c34dbf7bc21ee1bdc0a
Merge: db55980 52a92f3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 21:16:35 2012 -0400

    Merge branch 'master' into hermes

 framework/Core/lib/Horde/Themes/Cache.php                         |    4 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/Astring.php     |    2 +-
 .../Imap_Client/lib/Horde/Imap/Client/Data/Format/String.php      |    2 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   14 ++-
 framework/Imap_Client/package.xml                                 |    2 +
 framework/Imap_Client/test/Horde/Imap/Client/DataFormatTest.php   |   15 ++++
 imp/compose.php                                                   |   15 ++--
 imp/config/prefs.php                                              |   10 +--
 imp/docs/UPGRADING                                                |    3 +
 imp/lib/Ajax/Application.php                                      |    6 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |    8 +-
 imp/lib/Ajax/Application/Handler/Dynamic.php                      |    2 +-
 imp/lib/Imap/Tree.php                                             |   14 ++--
 imp/lib/LoginTasks/SystemTask/Upgrade.php                         |   19 +++++
 imp/templates/basic/mailbox/navbar.html.php                       |    4 +-
 koward/www/horde/config/prefs.php.dist                            |    2 +-
 16 files changed, 83 insertions(+), 39 deletions(-)

http://git.horde.org/horde-git/-/commit/f3ac7b28be700d3b73733c34dbf7bc21ee1bdc0a

-----------------------------------------------------------------------

commit 9c258a9dfedbbf2400ff633ca638e7c1fc36f8bc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 21:30:05 2012 -0400

    Bug: 11407 Only show feed link when we need to.

 trean/browse.php          |    1 +
 trean/lib/Application.php |   10 ----------
 trean/lib/Trean.php       |   13 +++++++++++++
 trean/search.php          |    1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/9c258a9dfedbbf2400ff633ca638e7c1fc36f8bc

-----------------------------------------------------------------------

commit 2b7f54c3ce83873089038481135de8b1f78ff764
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 21:33:53 2012 -0400

    Use a header div for now here.

 hermes/templates/dynamic/timeedit.inc    |    2 +-
 hermes/themes/default/dynamic/screen.css |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/2b7f54c3ce83873089038481135de8b1f78ff764

-----------------------------------------------------------------------

commit f500e16980d36af221147c0c2482f8a39de326fd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Oct 13 21:57:01 2012 -0400

    Tweak time entry form, css, remove unused classes etc...

 hermes/templates/dynamic/timeedit.inc    |    8 ++++----
 hermes/themes/default/dynamic/screen.css |    6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/f500e16980d36af221147c0c2482f8a39de326fd

-----------------------------------------------------------------------

commit 91581fdb4420697e70eb316bec22d8cab1eb615c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 15:52:20 2012 -0400

    Use horde-collapse

 hermes/templates/dynamic/timeedit.inc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/91581fdb4420697e70eb316bec22d8cab1eb615c

-----------------------------------------------------------------------

commit b7c2a8d185fdbbbde0639108a880e4022d2b5068
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 16:05:03 2012 -0400

    Unused

 hermes/templates/dynamic/timeedit.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/b7c2a8d185fdbbbde0639108a880e4022d2b5068

-----------------------------------------------------------------------

commit 67818881103094fe3452b7ee5f1fdfd26bccfb6a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 16:06:46 2012 -0400

    Removed commented out code.

 hermes/lib/View/Sidebar.php |   19 -------------------
 1 files changed, 0 insertions(+), 19 deletions(-)

http://git.horde.org/horde-git/-/commit/67818881103094fe3452b7ee5f1fdfd26bccfb6a

-----------------------------------------------------------------------

commit 13c2d7143b2e53def2fd74fa6cfaa8934f6eaa9f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 16:23:31 2012 -0400

    tweak css rules, move spinner.

 hermes/js/hermes.js                      |   24 +++++-----
 hermes/lib/Application.php               |    5 +-
 hermes/templates/dynamic/index.inc       |    3 +-
 hermes/templates/dynamic/timeedit.inc    |    2 +-
 hermes/themes/default/dynamic/screen.css |   68 ++++++++++++++++-------------
 5 files changed, 54 insertions(+), 48 deletions(-)

http://git.horde.org/horde-git/-/commit/13c2d7143b2e53def2fd74fa6cfaa8934f6eaa9f

-----------------------------------------------------------------------

commit 5d9e095291a58a625e27075912f1826b730ac771
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 18:28:21 2012 -0400

    More js/html/css cleanup.

 hermes/js/hermes.js                      |   57 ++++++------------
 hermes/lib/Ajax.php                      |    1 +
 hermes/templates/dynamic/index.inc       |    4 +-
 hermes/templates/dynamic/slices.inc      |   94 ++++++++++++++++++++++++++++++
 hermes/templates/dynamic/timeedit.inc    |   85 ---------------------------
 hermes/themes/default/dynamic/screen.css |    9 ---
 6 files changed, 115 insertions(+), 135 deletions(-)
 create mode 100644 hermes/templates/dynamic/slices.inc
 delete mode 100644 hermes/templates/dynamic/timeedit.inc

http://git.horde.org/horde-git/-/commit/5d9e095291a58a625e27075912f1826b730ac771

-----------------------------------------------------------------------

commit 2c9dfdf6f5dcab2b5f15bd6b32ef0eb6cc1e0970
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 18:31:46 2012 -0400

    Remove unnecessary div and css class

 hermes/templates/dynamic/slices.inc      |   56 ++++++++++++++---------------
 hermes/themes/default/dynamic/screen.css |    5 ---
 2 files changed, 27 insertions(+), 34 deletions(-)

http://git.horde.org/horde-git/-/commit/2c9dfdf6f5dcab2b5f15bd6b32ef0eb6cc1e0970

-----------------------------------------------------------------------

commit bed93a7a0e56830921683064d54dad6c54c66930
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 18:37:38 2012 -0400

    Remove unnecessary CSS class.

 hermes/templates/dynamic/slices.inc      |    2 +-
 hermes/themes/default/dynamic/screen.css |    9 ---------
 2 files changed, 1 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/bed93a7a0e56830921683064d54dad6c54c66930

-----------------------------------------------------------------------

commit 022ee13a751886b290be4536f4fbeb56d7c2788d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Oct 14 18:50:24 2012 -0400

    Add graphics to topbar buttons.

 hermes/themes/default/dynamic/screen.css  |   10 ++++++++++
 hermes/themes/default/graphics/admin.png  |  Bin 0 -> 518 bytes
 hermes/themes/default/graphics/hermes.png |  Bin 473 -> 666 bytes
 hermes/themes/default/graphics/search.png |  Bin 662 -> 465 bytes
 hermes/themes/default/graphics/time.png   |  Bin 0 -> 666 bytes
 5 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 hermes/themes/default/graphics/admin.png
 create mode 100644 hermes/themes/default/graphics/time.png

http://git.horde.org/horde-git/-/commit/022ee13a751886b290be4536f4fbeb56d7c2788d

-----------------------------------------------------------------------

commit 173be30f55ee4ce732269217851684fd324f1d94
Merge: 022ee13 d94d329
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 16 16:33:18 2012 -0400

    Merge branch 'master' into hermes

 content/lib/Objects/Manager.php                                   |    2 +-
 framework/Core/js/hordecore.js                                    |    3 +
 framework/Core/js/smartmobile.js                                  |    2 +-
 framework/Core/lib/Horde.php                                      |   19 +-
 framework/Core/lib/Horde/Core/Db/Migration.php                    |    2 +-
 framework/Core/lib/Horde/Core/Topbar.php                          |    6 +-
 framework/Core/lib/Horde/ErrorHandler.php                         |    6 +-
 framework/Core/package.xml                                        |    4 +-
 framework/Editor/js/ckeditor.js                                   |    2 +-
 framework/Editor/js/ckeditor_basic.js                             |    2 +-
 framework/Editor/js/lang/_languages.js                            |    2 +-
 framework/Editor/js/lang/af.js                                    |    2 +-
 framework/Editor/js/lang/ar.js                                    |    2 +-
 framework/Editor/js/lang/bg.js                                    |    2 +-
 framework/Editor/js/lang/bn.js                                    |    2 +-
 framework/Editor/js/lang/bs.js                                    |    2 +-
 framework/Editor/js/lang/ca.js                                    |    2 +-
 framework/Editor/js/lang/cs.js                                    |    2 +-
 framework/Editor/js/lang/cy.js                                    |    2 +-
 framework/Editor/js/lang/da.js                                    |    2 +-
 framework/Editor/js/lang/de.js                                    |    2 +-
 framework/Editor/js/lang/el.js                                    |    2 +-
 framework/Editor/js/lang/en-au.js                                 |    2 +-
 framework/Editor/js/lang/en-ca.js                                 |    2 +-
 framework/Editor/js/lang/en-gb.js                                 |    2 +-
 framework/Editor/js/lang/en.js                                    |    2 +-
 framework/Editor/js/lang/eo.js                                    |    2 +-
 framework/Editor/js/lang/es.js                                    |    2 +-
 framework/Editor/js/lang/et.js                                    |    2 +-
 framework/Editor/js/lang/eu.js                                    |    2 +-
 framework/Editor/js/lang/fa.js                                    |    2 +-
 framework/Editor/js/lang/fi.js                                    |    2 +-
 framework/Editor/js/lang/fo.js                                    |    2 +-
 framework/Editor/js/lang/fr-ca.js                                 |    2 +-
 framework/Editor/js/lang/fr.js                                    |    2 +-
 framework/Editor/js/lang/gl.js                                    |    2 +-
 framework/Editor/js/lang/gu.js                                    |    2 +-
 framework/Editor/js/lang/he.js                                    |    2 +-
 framework/Editor/js/lang/hi.js                                    |    2 +-
 framework/Editor/js/lang/hr.js                                    |    2 +-
 framework/Editor/js/lang/hu.js                                    |    2 +-
 framework/Editor/js/lang/id.js                                    |    1 +
 framework/Editor/js/lang/is.js                                    |    2 +-
 framework/Editor/js/lang/it.js                                    |    2 +-
 framework/Editor/js/lang/ja.js                                    |    2 +-
 framework/Editor/js/lang/ka.js                                    |    2 +-
 framework/Editor/js/lang/km.js                                    |    2 +-
 framework/Editor/js/lang/ko.js                                    |    2 +-
 framework/Editor/js/lang/ku.js                                    |    1 +
 framework/Editor/js/lang/lt.js                                    |    2 +-
 framework/Editor/js/lang/lv.js                                    |    2 +-
 framework/Editor/js/lang/mk.js                                    |    2 +-
 framework/Editor/js/lang/mn.js                                    |    2 +-
 framework/Editor/js/lang/ms.js                                    |    2 +-
 framework/Editor/js/lang/nb.js                                    |    2 +-
 framework/Editor/js/lang/nl.js                                    |    2 +-
 framework/Editor/js/lang/no.js                                    |    2 +-
 framework/Editor/js/lang/pl.js                                    |    2 +-
 framework/Editor/js/lang/pt-br.js                                 |    2 +-
 framework/Editor/js/lang/pt.js                                    |    2 +-
 framework/Editor/js/lang/ro.js                                    |    2 +-
 framework/Editor/js/lang/ru.js                                    |    2 +-
 framework/Editor/js/lang/sk.js                                    |    2 +-
 framework/Editor/js/lang/sl.js                                    |    2 +-
 framework/Editor/js/lang/sr-latn.js                               |    2 +-
 framework/Editor/js/lang/sr.js                                    |    2 +-
 framework/Editor/js/lang/sv.js                                    |    2 +-
 framework/Editor/js/lang/th.js                                    |    2 +-
 framework/Editor/js/lang/tr.js                                    |    2 +-
 framework/Editor/js/lang/ug.js                                    |    2 +-
 framework/Editor/js/lang/uk.js                                    |    2 +-
 framework/Editor/js/lang/vi.js                                    |    2 +-
 framework/Editor/js/lang/zh-cn.js                                 |    2 +-
 framework/Editor/js/lang/zh.js                                    |    2 +-
 framework/Editor/js/plugins/a11yhelp/lang/da.js                   |    2 +-
 framework/Editor/js/plugins/a11yhelp/lang/el.js                   |    2 +-
 framework/Editor/js/plugins/a11yhelp/lang/ku.js                   |    1 +
 framework/Editor/js/plugins/a11yhelp/lang/pt-br.js                |    1 +
 framework/Editor/js/plugins/a11yhelp/lang/ro.js                   |    1 +
 framework/Editor/js/plugins/a11yhelp/lang/sk.js                   |    1 +
 framework/Editor/js/plugins/a11yhelp/lang/zh-cn.js                |    2 +-
 framework/Editor/js/plugins/autogrow/plugin.js                    |    2 +-
 framework/Editor/js/plugins/bbcode/plugin.js                      |    2 +-
 framework/Editor/js/plugins/devtools/lang/ku.js                   |    1 +
 framework/Editor/js/plugins/devtools/lang/pt-br.js                |    1 +
 framework/Editor/js/plugins/devtools/lang/sk.js                   |    1 +
 framework/Editor/js/plugins/devtools/plugin.js                    |    2 +-
 framework/Editor/js/plugins/find/dialogs/find.js                  |    2 +-
 framework/Editor/js/plugins/flash/dialogs/flash.js                |    2 +-
 framework/Editor/js/plugins/image/dialogs/image.js                |    2 +-
 framework/Editor/js/plugins/link/dialogs/anchor.js                |    2 +-
 framework/Editor/js/plugins/link/dialogs/link.js                  |    2 +-
 framework/Editor/js/plugins/placeholder/lang/da.js                |    2 +-
 framework/Editor/js/plugins/placeholder/lang/ku.js                |    1 +
 framework/Editor/js/plugins/placeholder/lang/pt-br.js             |    1 +
 framework/Editor/js/plugins/placeholder/lang/sk.js                |    1 +
 framework/Editor/js/plugins/placeholder/lang/vi.js                |    2 +-
 framework/Editor/js/plugins/placeholder/lang/zh-cn.js             |    2 +-
 framework/Editor/js/plugins/placeholder/plugin.js                 |    2 +-
 framework/Editor/js/plugins/preview/preview.html                  |   10 +
 framework/Editor/js/plugins/smiley/dialogs/smiley.js              |    2 +-
 framework/Editor/js/plugins/specialchar/dialogs/specialchar.js    |    2 +-
 framework/Editor/js/plugins/specialchar/lang/el.js                |    1 +
 framework/Editor/js/plugins/specialchar/lang/fa.js                |    2 +-
 framework/Editor/js/plugins/specialchar/lang/he.js                |    1 +
 framework/Editor/js/plugins/specialchar/lang/ku.js                |    1 +
 framework/Editor/js/plugins/specialchar/lang/pt-br.js             |    1 +
 framework/Editor/js/plugins/tableresize/plugin.js                 |    2 +-
 framework/Editor/js/plugins/tabletools/dialogs/tableCell.js       |    2 +-
 framework/Editor/js/plugins/uicolor/lang/ku.js                    |    1 +
 framework/Editor/js/plugins/uicolor/lang/pt-br.js                 |    1 +
 framework/Editor/js/plugins/uicolor/lang/sk.js                    |    1 +
 framework/Editor/js/plugins/uicolor/lang/zh-cn.js                 |    2 +-
 framework/Editor/js/plugins/uicolor/plugin.js                     |    2 +-
 framework/Editor/js/skins/kama/dialog.css                         |   10 +-
 framework/Editor/js/skins/office2003/dialog.css                   |    9 +-
 framework/Editor/js/skins/v2/dialog.css                           |    8 +-
 framework/Editor/package.xml                                      |   52 ++-
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    1 +
 framework/Imap_Client/lib/Horde/Imap/Client/Auth/DigestMD5.php    |   12 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   75 ++-
 framework/Imap_Client/lib/Horde/Imap/Client/Exception.php         |    3 +
 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php      |   41 +--
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |   18 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php       |    2 +-
 framework/Imap_Client/package.xml                                 |   21 +-
 framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Task.php        |    2 +
 framework/Kolab_Format/package.xml                                |    4 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Data/Base.php     |    3 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Data/Exception.php      |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/List/Exception.php      |    2 +-
 .../Kolab_Storage/lib/Horde/Kolab/Storage/Object/Exception.php    |    2 +-
 hermes/lib/Application.php                                        |    2 +-
 horde/admin/config/config.php                                     |    1 -
 horde/templates/topbar/_menubar.html.php                          |    2 +-
 horde/themes/default/screen.css                                   |    4 +-
 imp/attachment.php                                                |    2 +-
 imp/compose.php                                                   |    2 +-
 imp/docs/CHANGES                                                  |    9 +
 imp/js/compose-dimp.js                                            |    4 +-
 imp/js/dimpbase.js                                                |   28 +-
 imp/js/login.js                                                   |   11 +-
 imp/js/smartmobile.js                                             |  100 ++--
 imp/js/viewport.js                                                |   21 +-
 imp/lib/Ajax/Application/ListMessages.php                         |    2 +-
 imp/lib/Compose.php                                               |    7 +-
 imp/lib/Contents.php                                              |    1 +
 imp/lib/Dynamic/Compose/Common.php                                |    2 +-
 imp/lib/Factory/Imaptree.php                                      |    5 +-
 imp/lib/Imap/Acl.php                                              |   12 +-
 imp/lib/Imap/Tree.php                                             |   43 +-
 imp/lib/LoginTasks/Task/PurgeSentmail.php                         |    2 +-
 imp/lib/LoginTasks/Task/RenameSentmailMonthly.php                 |    4 +-
 imp/lib/Mailbox.php                                               |    4 +
 imp/lib/Mailbox/List.php                                          |   60 +-
 imp/lib/Message.php                                               |    3 +
 imp/lib/Mime/Viewer/Itip.php                                      |    1 +
 imp/lib/Minimal/Compose.php                                       |   54 ++-
 imp/lib/Prefs/Special/HtmlSignature.php                           |    2 +-
 imp/lib/Sentmail/Sql.php                                          |   19 -
 imp/lib/Smartmobile.php                                           |   13 -
 imp/lib/Test.php                                                  |    2 -
 imp/lib/Ui/Compose.php                                            |   55 +--
 imp/lib/Ui/Editor.php                                             |    6 +-
 imp/lib/Ui/Folder.php                                             |   14 +-
 imp/lib/Ui/Headers.php                                            |    3 +-
 imp/lib/Ui/Imageview.php                                          |    4 +-
 imp/lib/Ui/Mailbox.php                                            |    3 +-
 imp/lib/Ui/Message.php                                            |    3 +-
 imp/lib/Ui/Search.php                                             |    3 +-
 imp/mailbox.php                                                   |    2 +-
 imp/package.xml                                                   |   12 +
 imp/templates/smartmobile/compose.html.php                        |    3 -
 imp/templates/smartmobile/folders.html.php                        |    4 +-
 imp/themes/default/basic/screen.css                               |    5 +
 imp/themes/default/dynamic/screen.css                             |   46 +-
 imp/thread.php                                                    |   11 +-
 ingo/bin/ingo-convert-datatree-shares-to-sql                      |  157 -----
 ingo/bin/ingo-convert-prefs-to-sql                                |    5 +-
 ingo/bin/ingo-convert-sql-shares-to-sqlng                         |    9 +
 ingo/bin/ingo-postfix-policyd                                     |    9 +
 ingo/blacklist.php                                                |    7 +-
 ingo/config/hooks.php.dist                                        |    6 +-
 ingo/docs/CHANGES                                                 |    2 +
 ingo/filters.php                                                  |    5 +-
 ingo/forward.php                                                  |    5 +-
 ingo/index.php                                                    |    5 +-
 ingo/lib/Api.php                                                  |    6 +-
 ingo/lib/Block/Overview.php                                       |    7 +-
 ingo/lib/Exception.php                                            |    6 +-
 ingo/lib/Exception/Pear.php                                       |    6 +-
 ingo/lib/Factory/Transport.php                                    |   13 +-
 ingo/lib/Form/Base.php                                            |    8 +-
 ingo/lib/Form/Forward.php                                         |    8 +-
 ingo/lib/Form/Spam.php                                            |    8 +-
 ingo/lib/Form/Vacation.php                                        |    8 +-
 ingo/lib/Script.php                                               |    2 +
 ingo/lib/Script/Imap/Live.php                                     |    8 +-
 ingo/lib/Script/Imap/Mock.php                                     |    9 +-
 ingo/lib/Script/Maildrop.php                                      |    6 +-
 ingo/lib/Script/Maildrop/Comment.php                              |    6 +-
 ingo/lib/Script/Maildrop/Recipe.php                               |    6 +-
 ingo/lib/Script/Maildrop/Variable.php                             |    6 +-
 ingo/lib/Script/Procmail.php                                      |    8 +-
 ingo/lib/Script/Procmail/Comment.php                              |    6 +-
 ingo/lib/Script/Procmail/Recipe.php                               |    6 +-
 ingo/lib/Script/Procmail/Variable.php                             |    6 +-
 ingo/lib/Script/Sieve.php                                         |    6 +-
 ingo/lib/Script/Sieve/Action.php                                  |    8 +-
 ingo/lib/Script/Sieve/Action/Addflag.php                          |    8 +-
 ingo/lib/Script/Sieve/Action/Discard.php                          |    8 +-
 ingo/lib/Script/Sieve/Action/Fileinto.php                         |    8 +-
 ingo/lib/Script/Sieve/Action/Flag.php                             |    8 +-
 ingo/lib/Script/Sieve/Action/Keep.php                             |    8 +-
 ingo/lib/Script/Sieve/Action/Notify.php                           |    8 +-
 ingo/lib/Script/Sieve/Action/Redirect.php                         |    8 +-
 ingo/lib/Script/Sieve/Action/Reject.php                           |    8 +-
 ingo/lib/Script/Sieve/Action/Removeflag.php                       |    8 +-
 ingo/lib/Script/Sieve/Action/Stop.php                             |    8 +-
 ingo/lib/Script/Sieve/Action/Vacation.php                         |    8 +-
 ingo/lib/Script/Sieve/Comment.php                                 |   12 +-
 ingo/lib/Script/Sieve/Else.php                                    |    8 +-
 ingo/lib/Script/Sieve/Elsif.php                                   |    8 +-
 ingo/lib/Script/Sieve/If.php                                      |    8 +-
 ingo/lib/Script/Sieve/Test.php                                    |    8 +-
 ingo/lib/Script/Sieve/Test/Address.php                            |    8 +-
 ingo/lib/Script/Sieve/Test/Allof.php                              |    8 +-
 ingo/lib/Script/Sieve/Test/Anyof.php                              |    8 +-
 ingo/lib/Script/Sieve/Test/Body.php                               |    8 +-
 ingo/lib/Script/Sieve/Test/Exists.php                             |    8 +-
 ingo/lib/Script/Sieve/Test/False.php                              |    8 +-
 ingo/lib/Script/Sieve/Test/Header.php                             |    8 +-
 ingo/lib/Script/Sieve/Test/Not.php                                |    8 +-
 ingo/lib/Script/Sieve/Test/Relational.php                         |    8 +-
 ingo/lib/Script/Sieve/Test/Size.php                               |    8 +-
 ingo/lib/Script/Sieve/Test/True.php                               |    8 +-
 ingo/lib/Storage/Blacklist.php                                    |    8 +-
 ingo/lib/Storage/Filters.php                                      |    8 +-
 ingo/lib/Storage/Filters/Sql.php                                  |    8 +-
 ingo/lib/Storage/Forward.php                                      |    8 +-
 ingo/lib/Storage/Mock.php                                         |    8 +-
 ingo/lib/Storage/Prefs.php                                        |   10 +-
 ingo/lib/Storage/Rule.php                                         |    8 +-
 ingo/lib/Storage/Spam.php                                         |    8 +-
 ingo/lib/Storage/Sql.php                                          |    9 +-
 ingo/lib/Storage/Vacation.php                                     |    8 +-
 ingo/lib/Storage/VacationTest.php                                 |    8 +-
 ingo/lib/Storage/Whitelist.php                                    |    8 +-
 ingo/lib/Test.php                                                 |    6 +-
 ingo/lib/Transport/Ldap.php                                       |    8 +-
 ingo/lib/Transport/Null.php                                       |    8 +-
 ingo/lib/Transport/Sivtest.php                                    |    9 +-
 ingo/lib/Transport/Timsieved.php                                  |   20 +-
 ingo/lib/Transport/Vfs.php                                        |    8 +-
 ingo/lib/Ui/VarRenderer/Ingo.php                                  |    6 +-
 ingo/package.xml                                                  |    4 +-
 ingo/rule.php                                                     |    7 +-
 ingo/script.php                                                   |    5 +-
 ingo/spam.php                                                     |    7 +-
 ingo/vacation.php                                                 |    5 +-
 ingo/whitelist.php                                                |    9 +-
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/js/kronolith.js                                         |    5 -
 kronolith/lib/Driver/Kolab.php                                    |   23 +-
 kronolith/lib/Event/Kolab.php                                     |    2 +-
 kronolith/lib/Kronolith.php                                       |   13 +-
 kronolith/lib/Storage/Kolab.php                                   |   39 +-
 kronolith/package.xml                                             |    6 +-
 kronolith/templates/chunks/calendar.php                           |   15 +-
 mnemo/docs/CHANGES                                                |    1 +
 mnemo/lib/Application.php                                         |   13 +-
 mnemo/lib/Driver/Kolab.php                                        |   32 +-
 mnemo/memo.php                                                    |   15 +-
 mnemo/package.xml                                                 |    4 +-
 mnemo/templates/memo/memo.inc                                     |    2 +-
 nag/docs/CHANGES                                                  |    3 +
 nag/lib/Application.php                                           |   10 +-
 nag/lib/Driver/Kolab.php                                          |   68 +-
 nag/package.xml                                                   |    8 +-
 nag/templates/alarm/mail.html.php                                 |    2 +-
 nag/templates/list.html.php                                       |    2 +-
 turba/docs/CHANGES                                                |    3 +
 turba/lib/Application.php                                         |    3 +-
 turba/lib/Driver/Kolab.php                                        |    3 +
 turba/lib/Driver/Share.php                                        |   14 +
 turba/lib/Turba.php                                               |    3 +
 turba/lib/View/List.php                                           |   19 +-
 turba/package.xml                                                 |   16 +-
 turba/templates/addressbook_list.php                              |   39 -
 turba/templates/browse/actions.inc                                |    2 +-
 whups/docs/CHANGES                                                |    2 +
 whups/lib/Driver/Sql.php                                          |   15 +-
 whups/lib/Form/Query/AttributeCriterion.php                       |   33 +-
 whups/lib/Form/Renderer/Query.php                                 |   12 +-
 whups/lib/Query.php                                               |    6 +
 whups/package.xml                                                 |    2 +
 whups/query/index.php                                             |   22 +-
 297 files changed, 1355 insertions(+), 996 deletions(-)

http://git.horde.org/horde-git/-/commit/173be30f55ee4ce732269217851684fd324f1d94

-----------------------------------------------------------------------

commit 6d5a15404ce2f1b7b6aaf3a00d8d679f015f0a1d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Oct 16 16:34:11 2012 -0400

    Not needed.

 hermes/js/hermes.js |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/6d5a15404ce2f1b7b6aaf3a00d8d679f015f0a1d

-----------------------------------------------------------------------

commit 4b85627ce108e4f0fa73a3e25b8700a6d90b2912
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Oct 17 09:20:56 2012 -0400

    Bug: 11532 Use default parameter values.

 framework/Core/lib/Horde/Core/TagBrowser.php |    2 +-
 nag/lib/TagBrowser.php                       |    2 +-
 trean/lib/TagBrowser.php                     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/4b85627ce108e4f0fa73a3e25b8700a6d90b2912

-----------------------------------------------------------------------

commit 48805a60499792ee1e1f88cbe736a2c4ec9d1669
Merge: 4b85627 39356e0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 13:51:57 2012 -0400

    Merge branch 'master' into hermes

 ansel/faces/gallery.php                                           |    2 +-
 ansel/gallery.php                                                 |    2 +-
 ansel/gallery/captions.php                                        |    2 +-
 ansel/gallery/delete.php                                          |    7 +-
 ansel/gallery/sort.php                                            |    2 +-
 ansel/image.php                                                   |   15 +-
 ansel/lib/Ajax/Application/Handler.php                            |    4 +-
 ansel/lib/Api.php                                                 |   10 +-
 ansel/lib/Faces/Base.php                                          |    6 +-
 ansel/lib/Gallery.php                                             |    3 +-
 ansel/lib/GalleryMode/Date.php                                    |    4 +-
 ansel/lib/GalleryMode/Normal.php                                  |    4 +-
 ansel/lib/Image.php                                               |    2 +-
 ansel/lib/View/Base.php                                           |    2 +-
 ansel/lib/View/GalleryProperties.php                              |   11 +-
 ansel/lib/View/Results.php                                        |    2 +-
 ansel/xppublish.php                                               |    2 +-
 framework/Core/js/map/theme/default/style.css                     |   46 +-
 framework/Core/lib/Horde/Core/ActiveSync/Driver.php               |    2 +-
 framework/Core/lib/Horde/Core/Ajax/Application.php                |   20 +-
 framework/Core/lib/Horde/Core/Ajax/Application/Handler.php        |   20 +
 framework/Core/lib/Horde/Core/Ajax/Response/Raw.php               |    4 +-
 framework/Core/lib/Horde/Core/Block/Layout/View.php               |   13 +-
 framework/Core/lib/Horde/Core/Script/Package/Datejs.php           |    4 +-
 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php             |    9 +-
 framework/Core/lib/Horde/Help.php                                 |   69 +-
 framework/Core/lib/Horde/PageOutput.php                           |    8 +-
 framework/Core/package.xml                                        |   10 +
 framework/Crypt/lib/Horde/Crypt/Smime.php                         |    3 +
 framework/Crypt/package.xml                                       |    4 +-
 framework/Date/lib/Horde/Date.php                                 |   26 +-
 framework/Date/package.xml                                        |    4 +-
 framework/Icalendar/lib/Horde/Icalendar.php                       |    8 +-
 framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php             |   67 +-
 framework/Icalendar/package.xml                                   |   72 +-
 framework/Icalendar/test/Horde/Icalendar/AllTests.php             |   39 +
 framework/Icalendar/test/Horde/Icalendar/Autoload.php             |   20 +
 framework/Icalendar/test/Horde/Icalendar/TimezonesTest.php        |   47 +
 .../test/Horde/Icalendar/fixtures/vTimezone/AuthorChats.txt       |   26 +
 .../test/Horde/Icalendar/fixtures/vTimezone/MMMPseminar.txt       |   50 +
 .../test/Horde/Icalendar/fixtures/vTimezone/Moon_Days.txt         |   38 +
 .../test/Horde/Icalendar/fixtures/vTimezone/ProjectCalendar.txt   |   10 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/Vilnius.ics |  185 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/Vilnius.txt |    6 +
 .../test/Horde/Icalendar/fixtures/vTimezone/allcategories.ics     |  166 +
 .../test/Horde/Icalendar/fixtures/vTimezone/allcategories.txt     |   22 +
 .../test/Horde/Icalendar/fixtures/vTimezone/allcategories.vcs     |  166 -
 .../test/Horde/Icalendar/fixtures/vTimezone/arsenal32FC.txt       |  558 ++
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/events.txt  |    2 +
 .../test/Horde/Icalendar/fixtures/vTimezone/exchange.txt          |    2 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/iscw.txt    |    6 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/meeting.txt |    2 +
 .../test/Horde/Icalendar/fixtures/vTimezone/privacy_events.txt    |    4 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/rfc2445.txt |   12 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test.ics    |   34 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test.txt    |    2 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test.vcs    |   34 -
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test4.ics   |   39 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test4.txt   |    2 +
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/test4.vcs   |   39 -
 .../test/Horde/Icalendar/fixtures/vTimezone/test_recurring.ics    |   50 +
 .../test/Horde/Icalendar/fixtures/vTimezone/test_recurring.txt    |    2 +
 .../test/Horde/Icalendar/fixtures/vTimezone/test_recurring.vcs    |   50 -
 .../Icalendar/test/Horde/Icalendar/fixtures/vTimezone/wicca.txt   |   24 +
 framework/Imap_Client/lib/Horde/Imap/Client.php                   |    1 -
 framework/Imap_Client/lib/Horde/Imap/Client/Base.php              |   35 +-
 framework/Imap_Client/lib/Horde/Imap/Client/Socket.php            |  110 +-
 framework/Imap_Client/package.xml                                 |    6 +-
 framework/Rpc/lib/Horde/Rpc/Syncml.php                            |    2 +-
 framework/Share/lib/Horde/Share/Kolab.php                         |    7 +-
 framework/Share/package.xml                                       |    4 +-
 framework/SyncMl/test/Horde/SyncMl/testsync.php                   |    2 +-
 framework/Url/lib/Horde/Url.php                                   |   11 +-
 framework/Url/test/Horde/Url/ConstructorTest.php                  |   30 +
 horde/admin/sessions.php                                          |    2 +-
 horde/docs/CHANGES                                                |    4 +
 horde/lib/Test.php                                                |   13 -
 horde/package.xml                                                 |  228 +-
 horde/rpc.php                                                     |    4 +-
 horde/services/ajax.php                                           |   18 +-
 horde/services/help/index.php                                     |   43 +-
 horde/themes/default/block/screen.css                             |   68 +
 horde/themes/default/graphics/keys/down.png                       |  Bin 0 -> 209 bytes
 horde/themes/default/graphics/keys/left.png                       |  Bin 0 -> 196 bytes
 horde/themes/default/graphics/keys/right.png                      |  Bin 0 -> 197 bytes
 horde/themes/default/graphics/keys/up.png                         |  Bin 0 -> 207 bytes
 horde/themes/default/screen.css                                   |   99 +-
 imp/compose.php                                                   |    6 +-
 imp/config/conf.xml                                               |   94 +-
 imp/config/prefs.php                                              |   36 +-
 imp/docs/UPGRADING                                                |    4 +
 imp/dynamic.php                                                   |    4 -
 imp/js/dimpbase.js                                                |   19 +-
 imp/lib/Ajax/Application/Handler/Common.php                       |    2 +-
 imp/lib/Dynamic/Base.php                                          |    7 +-
 imp/lib/Dynamic/Compose/Common.php                                |    3 +-
 imp/lib/Dynamic/Mailbox.php                                       |   19 +-
 imp/lib/Minimal/Compose.php                                       |    7 +-
 imp/lib/Minimal/Mailbox.php                                       |    4 +-
 imp/lib/Minimal/Search.php                                        |    2 +-
 imp/lib/Test.php                                                  |    6 +-
 imp/locale/en/help.xml                                            | 1431 ++---
 imp/locale/en/help_basic.xml                                      |  205 +
 imp/locale/en/help_dynamic.xml                                    |   78 +
 imp/mailbox.php                                                   |   19 +-
 imp/package.xml                                                   |   16 +-
 imp/templates/dynamic/mailbox.html.php                            |   24 -
 imp/templates/minimal/compose.html.php                            |    2 +-
 imp/themes/default/dynamic/screen.css                             |   43 +-
 imp/themes/default/graphics/key_down.png                          |  Bin 209 -> 0 bytes
 imp/themes/default/graphics/key_up.png                            |  Bin 207 -> 0 bytes
 imp/themes/default/graphics/locked-inv.png                        |  Bin 0 -> 431 bytes
 imp/themes/default/smartmobile/screen.css                         |    3 +
 ingo/forward.php                                                  |    2 +-
 ingo/spam.php                                                     |    2 +-
 ingo/templates/rule/header.inc                                    |    2 +-
 ingo/vacation.php                                                 |    2 +-
 koward/www/htdocs/horde/themes/screen.css                         |    8 +-
 kronolith/add.php                                                 |    4 +-
 kronolith/config/prefs.php                                        |    4 +-
 kronolith/docs/CHANGES                                            |    2 +
 kronolith/edit.php                                                |    2 +-
 kronolith/lib/Ajax.php                                            |    2 +-
 kronolith/lib/Ajax/Application/Handler.php                        |    6 +-
 kronolith/lib/Api.php                                             |    8 +-
 kronolith/lib/Application.php                                     |    5 +-
 kronolith/lib/Block/Month.php                                     |    2 +-
 kronolith/lib/Block/Monthlist.php                                 |    2 +-
 kronolith/lib/Calendar/External/Tasks.php                         |    3 +-
 kronolith/lib/Calendar/Internal.php                               |    2 +-
 kronolith/lib/Event.php                                           |   11 +-
 kronolith/lib/Event/Kolab.php                                     |    4 +-
 kronolith/lib/Form/EditCalendar.php                               |    4 +-
 kronolith/lib/Kronolith.php                                       |   26 +-
 kronolith/lib/View/Month.php                                      |    2 +-
 kronolith/package.xml                                             |    2 +
 kronolith/search.php                                              |    2 +-
 kronolith/templates/day/head_side_by_side.inc                     |    2 +-
 kronolith/templates/smartmobile/javascript_defs.php               |    3 +-
 kronolith/templates/week/head_side_by_side.inc                    |    2 +-
 kronolith/themes/default/block/screen.css                         |   13 +
 kronolith/themes/default/screen.css                               |    8 -
 mnemo/config/prefs.php                                            |    4 +-
 mnemo/lib/Api.php                                                 |   14 +-
 mnemo/lib/Application.php                                         |    7 +-
 mnemo/lib/Block/Summary.php                                       |    5 +-
 mnemo/lib/Mnemo.php                                               |   84 +-
 mnemo/list.php                                                    |    2 +-
 mnemo/memo.php                                                    |    2 +-
 mnemo/note/pdf.php                                                |    2 +-
 mnemo/notes/index.php                                             |    2 +-
 mnemo/package.xml                                                 |    8 +-
 mnemo/templates/data/import.inc                                   |    2 +-
 mnemo/templates/memo/memo.inc                                     |    2 +-
 mnemo/templates/stickies.html.php                                 |  110 -
 mnemo/themes/default/screen.css                                   |    3 -
 mnemo/view.php                                                    |    2 +-
 nag/app/controllers/SaveTask.php                                  |    8 +-
 nag/config/prefs.php                                              |    4 +-
 nag/data.php                                                      |   36 +-
 nag/docs/CHANGES                                                  |    3 +
 nag/js/smartmobile.js                                             |    4 +-
 nag/lib/Api.php                                                   |    6 +-
 nag/lib/Application.php                                           |   20 +-
 nag/lib/Block/Summary.php                                         |    9 +-
 nag/lib/CompleteTask.php                                          |    2 +-
 nag/lib/Driver.php                                                |    4 +-
 nag/lib/Driver/Kolab.php                                          |   11 +-
 nag/lib/Driver/Sql.php                                            |   84 +-
 nag/lib/Factory/Driver.php                                        |   16 +-
 nag/lib/Form/Task.php                                             |    2 +-
 nag/lib/Nag.php                                                   |   33 +-
 nag/lib/TagBrowser.php                                            |   20 +-
 nag/lib/Task.php                                                  |    3 +-
 nag/lib/Tasklist.php                                              |    2 +-
 nag/lib/View/List.php                                             |   10 +-
 nag/package.xml                                                   |    6 +
 nag/templates/data/export.inc                                     |    2 +-
 nag/templates/data/import.inc                                     |    2 +-
 nag/templates/list.html.php                                       |    2 +-
 nag/themes/default/block/screen.css                               |    9 +
 nag/themes/default/screen.css                                     |    8 +-
 turba/docs/CHANGES                                                |    5 +-
 turba/lib/Ajax/Application/Smartmobile.php                        |   27 +-
 turba/lib/Prefs/Special/Columnselect.php                          |   15 +-
 turba/package.xml                                                 |    4 +
 turba/templates/prefs/column.html                                 |   34 +-
 turba/themes/default/screen.css                                   |    2 +-
 whups/lib/Application.php                                         |   10 +-
 whups/lib/Whups.php                                               |   11 +
 whups/mybugs.php                                                  |    2 +
 whups/query/index.php                                             |    2 +-
 whups/query/run.php                                               |    1 +
 whups/queue/index.php                                             |    1 +
 whups/search.php                                                  |    1 +
 whups/ticket/index.php                                            |    1 +
 wicked/display.php                                                |    1 +
 wicked/lib/Application.php                                        |    6 -
 wicked/lib/Wicked.php                                             |    9 +
 199 files changed, 3572 insertions(+), 2079 deletions(-)

http://git.horde.org/horde-git/-/commit/48805a60499792ee1e1f88cbe736a2c4ec9d1669

-----------------------------------------------------------------------

commit 1311225c9d206f6307af5e4bbbb4c96f08f52d40
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 13:55:29 2012 -0400

    More interface fixes. Move old HermesNav stuff to sidebar

 hermes/js/hermes.js                       |    8 ++---
 hermes/templates/dynamic/index.inc        |   21 --------------
 hermes/templates/dynamic/sidebar.html.php |   42 ++++++++++++++++++++++-------
 hermes/themes/default/dynamic/screen.css  |   42 ++++++++++++++++++++---------
 4 files changed, 64 insertions(+), 49 deletions(-)

http://git.horde.org/horde-git/-/commit/1311225c9d206f6307af5e4bbbb4c96f08f52d40

-----------------------------------------------------------------------

commit 7c39a749c39de261573e154b68ec4a4e108d2ffb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:01:41 2012 -0400

    Add some new icons

 hermes/templates/dynamic/sidebar.html.php  |    4 ++--
 hermes/themes/default/graphics/admin.png   |  Bin 518 -> 667 bytes
 hermes/themes/default/graphics/favicon.ico |  Bin 1406 -> 1742 bytes
 hermes/themes/default/graphics/log.png     |  Bin 210 -> 0 bytes
 hermes/themes/default/graphics/pause.png   |  Bin 107 -> 226 bytes
 hermes/themes/default/graphics/play.png    |  Bin 186 -> 342 bytes
 hermes/themes/default/graphics/stop.png    |  Bin 0 -> 206 bytes
 7 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 hermes/themes/default/graphics/log.png
 create mode 100644 hermes/themes/default/graphics/stop.png

http://git.horde.org/horde-git/-/commit/7c39a749c39de261573e154b68ec4a4e108d2ffb

-----------------------------------------------------------------------

commit 16a0392e3528589e6b5c2b590c73787abfb165b0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:09:06 2012 -0400

    Not used.

 hermes/js/hermes.js |    8 --------
 hermes/lib/Ajax.php |    1 -
 2 files changed, 0 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/16a0392e3528589e6b5c2b590c73787abfb165b0

-----------------------------------------------------------------------

commit adf38222fa7734faa695bb5f7c4c513d75b84d89
Merge: 16a0392 7ec9a24
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:12:22 2012 -0400

    Merge branch 'master' into hermes

 kronolith/js/kronolith.js |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/adf38222fa7734faa695bb5f7c4c513d75b84d89

-----------------------------------------------------------------------

commit afc5c82e912932b31efd18c06ac4ffebbbe9aa0c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:12:54 2012 -0400

    Unused.

 hermes/js/hermes.js |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/afc5c82e912932b31efd18c06ac4ffebbbe9aa0c

-----------------------------------------------------------------------

commit a59bba949e5899a1a78c3db892da6f49099ffaf3
Merge: afc5c82 2803490
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:17:26 2012 -0400

    Merge branch 'master' into hermes

 kronolith/js/kronolith.js |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/a59bba949e5899a1a78c3db892da6f49099ffaf3

-----------------------------------------------------------------------

commit c1bdcf453efd96a30c8459a132ac20d48cf3e8c0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:54:47 2012 -0400

    Clean up clickHandler a bit.

 hermes/js/hermes.js |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/c1bdcf453efd96a30c8459a132ac20d48cf3e8c0

-----------------------------------------------------------------------

commit 35019a872b22fd3c428c693f6c718e50776fa56a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 14:55:05 2012 -0400

    Start fixing timers.

 hermes/js/hermes.js                      |   16 ++++++++--------
 hermes/themes/default/dynamic/screen.css |   25 +++++++++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/35019a872b22fd3c428c693f6c718e50776fa56a

-----------------------------------------------------------------------

commit 4921a36bedf8d8c88e0cfa2001274789698f7f8f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 16:43:28 2012 -0400

    More UI fixes.
    
    Activate timer controls, fix click handling of some elements.

 hermes/js/hermes.js                       |   38 +++++++++++++---------------
 hermes/templates/dynamic/index.inc        |    3 +-
 hermes/templates/dynamic/sidebar.html.php |    4 +-
 hermes/templates/dynamic/timer.inc        |    4 ++-
 4 files changed, 25 insertions(+), 24 deletions(-)

http://git.horde.org/horde-git/-/commit/4921a36bedf8d8c88e0cfa2001274789698f7f8f

-----------------------------------------------------------------------

commit b48a27f49eb62659bba839d9fe2860ce9d768f7f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 16:57:04 2012 -0400

    Move the quickAdd CSS rules to horde.

 horde/themes/default/screen.css             |   20 ++++++++++++++++++++
 kronolith/templates/dynamic/index.inc       |    2 +-
 kronolith/themes/default/dynamic/screen.css |   18 ------------------
 nag/templates/quick.inc                     |    2 +-
 nag/themes/default/screen.css               |   15 ---------------
 5 files changed, 22 insertions(+), 35 deletions(-)

http://git.horde.org/horde-git/-/commit/b48a27f49eb62659bba839d9fe2860ce9d768f7f

-----------------------------------------------------------------------

commit 337b5cf336fe4b224ec732ea4e5d6e3e27ff9f2e
Merge: b48a27f 5cf21a3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 17:37:56 2012 -0400

    Merge branch 'master' into hermes

 .../Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Stamp/Uids.php   |    3 +-
 framework/Kolab_Storage/lib/Horde/Kolab/Storage/Object.php        |    9 +-
 framework/Kolab_Storage/package.xml                               |    4 +-
 .../Kolab_Storage/test/Horde/Kolab/Storage/Unit/ObjectTest.php    |   28 ++-
 imp/docs/CHANGES                                                  |    2 +
 imp/js/dimpbase.js                                                |    4 -
 imp/lib/Dynamic/Mailbox.php                                       |    7 -
 imp/lib/Mailbox/List.php                                          |   74 ++---
 imp/package.xml                                                   |   10 +-
 imp/themes/default/dynamic/screen.css                             |    3 -
 imp/themes/default/graphics/help.png                              |  Bin 597 -> 0 bytes
 11 files changed, 63 insertions(+), 81 deletions(-)

http://git.horde.org/horde-git/-/commit/337b5cf336fe4b224ec732ea4e5d6e3e27ff9f2e

-----------------------------------------------------------------------

commit 853a1b81d33b026a6248ac8080f2dbf73d8ee716
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:09:12 2012 -0400

    Remove cruft

 hermes/js/hermes.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/853a1b81d33b026a6248ac8080f2dbf73d8ee716

-----------------------------------------------------------------------

commit 07fba6f11f5fbf27bd120766cdc1652793e2d9a0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:09:29 2012 -0400

    Fix new timer creation.

 hermes/js/hermes.js                      |   20 +++++++-------------
 hermes/templates/dynamic/timer.inc       |   13 +++++++------
 hermes/themes/default/dynamic/screen.css |   16 +++-------------
 3 files changed, 17 insertions(+), 32 deletions(-)

http://git.horde.org/horde-git/-/commit/07fba6f11f5fbf27bd120766cdc1652793e2d9a0

-----------------------------------------------------------------------

commit a92b85e8b506ac7df5b256c6cff333efb9a73b04
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:18:54 2012 -0400

    This has it's own dom id now.

 hermes/js/hermes.js |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/a92b85e8b506ac7df5b256c6cff333efb9a73b04

-----------------------------------------------------------------------

commit 9a44709337dd90e3c3c0f114092dad416b252a30
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:28:38 2012 -0400

    Fix timer start/pausing

 hermes/js/hermes.js |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

http://git.horde.org/horde-git/-/commit/9a44709337dd90e3c3c0f114092dad416b252a30

-----------------------------------------------------------------------

commit c2ed0f0e1213b672058e02628a5d644ce23d6e67
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:38:10 2012 -0400

    Fix Horde_Calendar usage

 hermes/js/hermes.js |    2 ++
 hermes/lib/Ajax.php |    4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/c2ed0f0e1213b672058e02628a5d644ce23d6e67

-----------------------------------------------------------------------

commit 415a6805fd19aa8e79b1d3aee50d17d489e12f7a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:48:58 2012 -0400

    CSS cleanup

 hermes/templates/dynamic/index.inc        |    2 -
 hermes/templates/dynamic/sidebar.html.php |    2 +-
 hermes/themes/default/dynamic/screen.css  |  101 +++++++++++------------------
 3 files changed, 38 insertions(+), 67 deletions(-)

http://git.horde.org/horde-git/-/commit/415a6805fd19aa8e79b1d3aee50d17d489e12f7a

-----------------------------------------------------------------------

commit 99039bf8bc95f68d56ab60c3c319f7df7e1a838a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 18:51:52 2012 -0400

    No rounded css anymore.

 hermes/templates/dynamic/slices.inc      |    2 +-
 hermes/themes/default/dynamic/screen.css |   18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/99039bf8bc95f68d56ab60c3c319f7df7e1a838a

-----------------------------------------------------------------------

commit 480fd5288c8deece28dcbbf07b586827cdee1e66
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 19:07:32 2012 -0400

    Clean up edit/delete links for slices.

 hermes/templates/dynamic/slices.inc      |    2 +-
 hermes/themes/default/dynamic/screen.css |   23 ++++++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/480fd5288c8deece28dcbbf07b586827cdee1e66

-----------------------------------------------------------------------

commit b9c460cc38ccdb2497c9155b71fb7471d25d6717
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Oct 18 19:13:21 2012 -0400

    Add new graphics

 hermes/themes/default/graphics/delete.png |  Bin 0 -> 412 bytes
 hermes/themes/default/graphics/edit.png   |  Bin 0 -> 277 bytes
 hermes/themes/default/graphics/picker.png |  Bin 320 -> 574 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 hermes/themes/default/graphics/delete.png
 create mode 100644 hermes/themes/default/graphics/edit.png

http://git.horde.org/horde-git/-/commit/b9c460cc38ccdb2497c9155b71fb7471d25d6717




More information about the commits mailing list