[commits] Horde branch imp_6_1 updated. 8abf2a48be5ad331c70eb4ec39fb7b68ef3ba610
Michael M Slusarz
slusarz at horde.org
Mon Nov 5 06:39:52 UTC 2012
The branch "imp_6_1" has been updated.
The following is a summary of the commits.
from: bc80cea681e472a7e7f97a478589d1f8d6c9feb0
7af0fba Unneeded header
4084592 Add some caching to ACL object to prevent duplicate IMAP ACL requests
bbcd6dd Fix imp-mailbox-decode decoding of IMAP mailbox string
541d434 Fix flushing debug stream when BINARY error is encountered
2e22b76 [mms] Don't attempt to use non-IMAP mailbox names in IMAP server commands (Bug #11623).
af7cc23 [mms] Correctly remove unseen information from folder tree in dynamic mailbox view when mailbox is marked as not polled for new mail.
c0b6f14 Released Horde_Stream-1.1.0
be16339 Development mode for Horde_Stream-1.1.1
e6ee1d2 phpdoc spelling
0794e63 Make clear that these objects are NOT part of the external API
9ef5620 Guess the addition of Horde_Imap_Client_Ids_Map is enough to bump API level
fcf4289 Remove - this occurred after 2.0.0 was released
45faa09 [mms] Split debugging code from Base driver into separate object.
f8e8804 Add proper shutdown method that ensures logout method is always called
f70cbb7 Ensure object is never cloned
39e9c82 Released Horde_Imap_Client-2.1.0
8534492 Development mode for Horde_Imap_Client-2.1.1
91d2da7 Mirror regular login screen - there is no 'Log in' header
7e2138a Do basic HTML cleanup for Ingo 3.0.x
d7acbc2 Clean up search criteria styling
1d25beb Some documentation tweaks
54c8740 These two graphics should be the same
3c703b7 [mms] Massive performance increase for cached FETCH queries.
c10ff43 [mms] Only specify maxmemory argument when creating temp stream if it was given.
431e1fe Released Horde_Stream-1.1.1
5a72d3a Development mode for Horde_Stream-1.1.2
2a296a8 Released Horde_Imap_Client-2.1.1
33c28c5 Development mode for Horde_Imap_Client-2.1.2
f82bd7e Bug #11632: Allow method to be called statically
5789b20 Remove duplicate Edit as New entry
53dbe38 [mms] Correctly show ACL entry for current user even if ACL response for mailbox is empty.
d1cfbf9 [mms] Fix parsing empty ACL responses.
7150818 Hotfix for IE 9 issue
886477b A couple of other fixes from prototypejs source
9f09790 Fix suppressing apply filter preferences for backends that don't support it
febf722 Clean up language
dcfbfd9 Better labels
a7c4026 Indication that personal certificate does not exist
b9c0559 Remove the 'affecting' prefs block headers
950025b Remove use of 'we' in config files
ee08d5b This is a basic view only pref
2ca4b64 Make all minimal view prefs advanced
83918fb [mms] Fix importing personal S/MIME certificate.
8abf2a4 Merge branch 'master' into imp_6_1
-----------------------------------------------------------------------
commit 7af0fba51c018448feec314c909cffe80600584e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 14:07:42 2012 -0600
Unneeded header
imp/docs/INSTALL | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/7af0fba51c018448feec314c909cffe80600584e
-----------------------------------------------------------------------
commit 40845922f70ebf3c3d06d9645ade29f2998369a2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 14:38:17 2012 -0600
Add some caching to ACL object to prevent duplicate IMAP ACL requests
imp/lib/Imap/Acl.php | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/40845922f70ebf3c3d06d9645ade29f2998369a2
-----------------------------------------------------------------------
commit bbcd6dd6e7de5c58fadc04f16db675b8fa0f2ae2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 14:54:49 2012 -0600
Fix imp-mailbox-decode decoding of IMAP mailbox string
imp/lib/Imap.php | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/bbcd6dd6e7de5c58fadc04f16db675b8fa0f2ae2
-----------------------------------------------------------------------
commit 541d4345df44066e2ff74c758b777062f19165bf
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 15:11:13 2012 -0600
Fix flushing debug stream when BINARY error is encountered
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/541d4345df44066e2ff74c758b777062f19165bf
-----------------------------------------------------------------------
commit 2e22b764d5bda47e965df2e4f35a1adb9d21eed0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 15:20:59 2012 -0600
[mms] Don't attempt to use non-IMAP mailbox names in IMAP server commands (Bug #11623).
Conflicts:
imp/package.xml
imp/docs/CHANGES | 2 ++
imp/lib/Imap/Tree.php | 2 +-
imp/lib/Mailbox.php | 4 ++--
imp/package.xml | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/2e22b764d5bda47e965df2e4f35a1adb9d21eed0
-----------------------------------------------------------------------
commit af7cc23767c7abf0957a2a6bc3195e96ad92126d
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 15:28:46 2012 -0600
[mms] Correctly remove unseen information from folder tree in dynamic mailbox view when mailbox is marked as not polled for new mail.
imp/docs/CHANGES | 2 ++
imp/js/dimpbase.js | 2 +-
imp/package.xml | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/af7cc23767c7abf0957a2a6bc3195e96ad92126d
-----------------------------------------------------------------------
commit c0b6f14eb5c86f7b63ae99788c78dbc31a35f366
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:06:43 2012 -0600
Released Horde_Stream-1.1.0
framework/Stream/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/c0b6f14eb5c86f7b63ae99788c78dbc31a35f366
-----------------------------------------------------------------------
commit be1633927e675edde37dc6f5f4fddf60e2fe737f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:06:43 2012 -0600
Development mode for Horde_Stream-1.1.1
framework/Stream/package.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/be1633927e675edde37dc6f5f4fddf60e2fe737f
-----------------------------------------------------------------------
commit e6ee1d28e45a9aa8fb013ace3133719b535c4a71
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:12:39 2012 -0600
phpdoc spelling
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e6ee1d28e45a9aa8fb013ace3133719b535c4a71
-----------------------------------------------------------------------
commit 0794e639f77b88ab1cd4268d68c92bfdd341705c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:15:10 2012 -0600
Make clear that these objects are NOT part of the external API
framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php | 4 ++++
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Catenate.php | 4 ++++
framework/Imap_Client/lib/Horde/Imap/Client/Socket/ClientSort.php | 4 ++++
3 files changed, 12 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/0794e639f77b88ab1cd4268d68c92bfdd341705c
-----------------------------------------------------------------------
commit 9ef56209bd77640a7cb3cca7a607bc9a8c6d1e21
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:19:29 2012 -0600
Guess the addition of Horde_Imap_Client_Ids_Map is enough to bump API level
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 6 ++++++
framework/Imap_Client/lib/Horde/Imap/Client/Ids/Map.php | 2 ++
framework/Imap_Client/package.xml | 8 ++++----
3 files changed, 12 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/9ef56209bd77640a7cb3cca7a607bc9a8c6d1e21
-----------------------------------------------------------------------
commit fcf42893fdd72ede3e77db6dcee279c187497a22
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 16:22:26 2012 -0600
Remove - this occurred after 2.0.0 was released
framework/Imap_Client/package.xml | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/fcf42893fdd72ede3e77db6dcee279c187497a22
-----------------------------------------------------------------------
commit 45faa096fd62c59e38f8ad3dee74ed1d7b72ea9c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 18:36:24 2012 -0600
[mms] Split debugging code from Base driver into separate object.
In addition to making the debugging code cleaner and easier to
read/maintain, it fixes the issue where an error may cause debugging
information to get lost. By putting in own object, can ensure that
buffered debug data is always flushed before close.
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 9 +
framework/Imap_Client/lib/Horde/Imap/Client.php | 8 -
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 97 +-----
framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php | 174 +++++++++++
framework/Imap_Client/lib/Horde/Imap/Client/Cache.php | 35 ++-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 51 ++--
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 4 +-
framework/Imap_Client/package.xml | 10 +-
8 files changed, 250 insertions(+), 138 deletions(-)
create mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php
http://git.horde.org/horde-git/-/commit/45faa096fd62c59e38f8ad3dee74ed1d7b72ea9c
-----------------------------------------------------------------------
commit f8e8804924b7d35cf5ba5db5bef575f898e3545b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 18:40:57 2012 -0600
Add proper shutdown method that ensures logout method is always called
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f8e8804924b7d35cf5ba5db5bef575f898e3545b
-----------------------------------------------------------------------
commit f70cbb783c02586ea22de47d1491746d75cebbbf
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 18:43:30 2012 -0600
Ensure object is never cloned
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f70cbb783c02586ea22de47d1491746d75cebbbf
-----------------------------------------------------------------------
commit 39e9c823c131909fe37b2058a5be878eff8bebad
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 20:37:48 2012 -0600
Released Horde_Imap_Client-2.1.0
framework/Imap_Client/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/39e9c823c131909fe37b2058a5be878eff8bebad
-----------------------------------------------------------------------
commit 8534492b3f44078caa345b637eee5f39abb37b37
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 20:37:49 2012 -0600
Development mode for Horde_Imap_Client-2.1.1
framework/Imap_Client/package.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/8534492b3f44078caa345b637eee5f39abb37b37
-----------------------------------------------------------------------
commit 91d2da70bcf18976a094b022f8371e70ed5386cf
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 21:53:50 2012 -0600
Mirror regular login screen - there is no 'Log in' header
horde/templates/login/smartmobile.html.php | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/91d2da70bcf18976a094b022f8371e70ed5386cf
-----------------------------------------------------------------------
commit 7e2138abde46088e8083a59e257c4a7d27202e8b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 22:29:54 2012 -0600
Do basic HTML cleanup for Ingo 3.0.x
Full rewrite is probably a good idea for 3.1, to get rid of table
formatting. This at least makes fields somewhat easier to read and have
elements line up with each other.
ingo/rule.php | 2 +-
ingo/templates/blacklist/blacklist.inc | 34 ++++++++++++++---------
ingo/templates/filters/footer.inc | 2 +-
ingo/templates/filters/header.inc | 23 ++++++++-------
ingo/templates/filters/settings.inc | 2 +-
ingo/templates/rule/filter.inc | 8 +++---
ingo/templates/rule/footer.inc | 46 +++++++++++++++++--------------
ingo/templates/rule/header.inc | 26 +++++++++++-------
ingo/templates/script/activate.inc | 2 +-
ingo/templates/script/header.inc | 2 +-
ingo/templates/script/script.inc | 2 +-
ingo/templates/whitelist/whitelist.inc | 22 +++++++++-----
ingo/themes/default/screen.css | 14 +++++++++
13 files changed, 112 insertions(+), 73 deletions(-)
http://git.horde.org/horde-git/-/commit/7e2138abde46088e8083a59e257c4a7d27202e8b
-----------------------------------------------------------------------
commit d7acbc2828397703831d8e82fb6d9f1d432794d2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 23:00:01 2012 -0600
Clean up search criteria styling
imp/js/search.js | 10 ++++----
imp/templates/search/search.html.php | 8 +++---
imp/themes/default/screen.css | 40 +++++++++++++++++----------------
3 files changed, 30 insertions(+), 28 deletions(-)
http://git.horde.org/horde-git/-/commit/d7acbc2828397703831d8e82fb6d9f1d432794d2
-----------------------------------------------------------------------
commit 1d25bebe09dbe874981ba1dff4df94dd0981992f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 23:35:23 2012 -0600
Some documentation tweaks
imp/docs/INSTALL | 25 +++++++++++--------------
imp/docs/PERFORMANCE | 16 +++++++++++++---
2 files changed, 24 insertions(+), 17 deletions(-)
http://git.horde.org/horde-git/-/commit/1d25bebe09dbe874981ba1dff4df94dd0981992f
-----------------------------------------------------------------------
commit 54c8740a5c2d7e33ab497aafa9d287db14a6acf5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 23:39:27 2012 -0600
These two graphics should be the same
imp/themes/default/graphics/delete.png | Bin 412 -> 408 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/54c8740a5c2d7e33ab497aafa9d287db14a6acf5
-----------------------------------------------------------------------
commit 3c703b79a2bbaa0a1a8749b4dc4d019f509a2a8c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Nov 2 23:55:22 2012 -0600
[mms] Massive performance increase for cached FETCH queries.
Turns out that Horde_Imap_Client_Ids#add() is very slow. Probably
because we are adding as strings instead of array, so it needs to be
parsed every call.
Optimize even more by passing a single array, and indicate that there is
no need to check for duplicates, since this would have already been
caught in the code.
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 9 ++++++---
framework/Imap_Client/package.xml | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/3c703b79a2bbaa0a1a8749b4dc4d019f509a2a8c
-----------------------------------------------------------------------
commit c10ff43bf2700d08d2f7e5131323c5da3e148af7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 00:58:03 2012 -0600
[mms] Only specify maxmemory argument when creating temp stream if it was given.
For some strange reason, this will cause a PHP segfault after about 1000
temp streams are opened (i.e. exporting a mailbox in IMP in a mailbox
with 5000 messages would break). Seems to work perfectly when not
specified, so I'm not going to track this down anymore.
framework/Stream/lib/Horde/Stream/Temp.php | 12 ++++++------
framework/Stream/package.xml | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/c10ff43bf2700d08d2f7e5131323c5da3e148af7
-----------------------------------------------------------------------
commit 431e1fe84cdf3e2f6a4380b1e829257dffb51b4c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 01:04:43 2012 -0600
Released Horde_Stream-1.1.1
framework/Stream/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/431e1fe84cdf3e2f6a4380b1e829257dffb51b4c
-----------------------------------------------------------------------
commit 5a72d3acb73ed6cb96da5a6ef4fc72a0c878c086
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 01:04:43 2012 -0600
Development mode for Horde_Stream-1.1.2
framework/Stream/package.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/5a72d3acb73ed6cb96da5a6ef4fc72a0c878c086
-----------------------------------------------------------------------
commit 2a296a8b4d934d2f9e619e98657eb84b7bdb3042
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 01:08:41 2012 -0600
Released Horde_Imap_Client-2.1.1
framework/Imap_Client/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/2a296a8b4d934d2f9e619e98657eb84b7bdb3042
-----------------------------------------------------------------------
commit 33c28c5b3e4f09e6c7d750f276186336e7f3a8e0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 01:08:41 2012 -0600
Development mode for Horde_Imap_Client-2.1.2
framework/Imap_Client/package.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/33c28c5b3e4f09e6c7d750f276186336e7f3a8e0
-----------------------------------------------------------------------
commit f82bd7e8b42be5a02110bb893088bd6e0f3bd180
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 10:27:59 2012 -0600
Bug #11632: Allow method to be called statically
framework/Core/lib/Horde/Core/Script/Package/Datejs.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/f82bd7e8b42be5a02110bb893088bd6e0f3bd180
-----------------------------------------------------------------------
commit 5789b20d13f97c9652eb21db3c9b0f20fa7eb6af
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 10:47:50 2012 -0600
Remove duplicate Edit as New entry
imp/js/dimpbase.js | 6 +-----
imp/lib/Dynamic/Mailbox.php | 1 -
2 files changed, 1 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/5789b20d13f97c9652eb21db3c9b0f20fa7eb6af
-----------------------------------------------------------------------
commit 53dbe382846df93a0cda2e048702645d08b392f3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 10:58:34 2012 -0600
[mms] Correctly show ACL entry for current user even if ACL response for mailbox is empty.
It is possible ACL response will be empty, but we need to explicitly
check via MYRIGHTS to see if the user really does have ACL rights to the
mailbox.
imp/docs/CHANGES | 2 ++
imp/lib/Imap/Acl.php | 23 +++++++++++++++++++----
imp/lib/Prefs/Special/Acl.php | 8 ++++----
imp/package.xml | 2 ++
4 files changed, 27 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/53dbe382846df93a0cda2e048702645d08b392f3
-----------------------------------------------------------------------
commit d1cfbf939742aca1b529dcc9c80955282f526181
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 11:06:32 2012 -0600
[mms] Fix parsing empty ACL responses.
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 5 +++--
framework/Imap_Client/package.xml | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/d1cfbf939742aca1b529dcc9c80955282f526181
-----------------------------------------------------------------------
commit 71508186216dafe445c3f395a0a1ad2bfe959ede
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 13:07:20 2012 -0600
Hotfix for IE 9 issue
Prevents popup IMP dynamic message page from working.
https://github.com/sstephenson/prototype/pull/82
framework/Core/js/prototype.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/71508186216dafe445c3f395a0a1ad2bfe959ede
-----------------------------------------------------------------------
commit 886477b4cc3b6d023226f44e860dd15a4f4de090
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sat Nov 3 13:07:35 2012 -0600
A couple of other fixes from prototypejs source
framework/Core/js/prototype.js | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/886477b4cc3b6d023226f44e860dd15a4f4de090
-----------------------------------------------------------------------
commit 9f09790a4b9369b70a2046b299791ac5f8254f9e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:09:54 2012 -0700
Fix suppressing apply filter preferences for backends that don't support it
imp/config/prefs.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/9f09790a4b9369b70a2046b299791ac5f8254f9e
-----------------------------------------------------------------------
commit febf7225cbd78c33f80b605da159dd8ac677d24c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:10:55 2012 -0700
Clean up language
imp/config/prefs.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/febf7225cbd78c33f80b605da159dd8ac677d24c
-----------------------------------------------------------------------
commit dcfbfd9b52673fdfeab369c5b52e6f1f8c0b53f7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:16:55 2012 -0700
Better labels
imp/lib/Crypt/Smime.php | 4 ++--
imp/templates/prefs/smimeprivatekey.html.php | 2 +-
imp/templates/smime/import_key.html.php | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/dcfbfd9b52673fdfeab369c5b52e6f1f8c0b53f7
-----------------------------------------------------------------------
commit a7c4026496b90e53ee4617d87ff67951513b00e9
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:17:20 2012 -0700
Indication that personal certificate does not exist
imp/templates/prefs/smimeprivatekey.html.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/a7c4026496b90e53ee4617d87ff67951513b00e9
-----------------------------------------------------------------------
commit b9c0559e1fa15d39c8dd34bbc075978a1ace7681
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:31:14 2012 -0700
Remove the 'affecting' prefs block headers
imp/config/prefs.php | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 deletions(-)
http://git.horde.org/horde-git/-/commit/b9c0559e1fa15d39c8dd34bbc075978a1ace7681
-----------------------------------------------------------------------
commit 950025b1ccdce8299efd0d707b5d16264ab181b8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:31:32 2012 -0700
Remove use of 'we' in config files
imp/config/hooks.php.dist | 8 ++++----
imp/config/prefs.php | 43 +++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 26 deletions(-)
http://git.horde.org/horde-git/-/commit/950025b1ccdce8299efd0d707b5d16264ab181b8
-----------------------------------------------------------------------
commit ee08d5ba16256c6cc048d1e0b8369f4be44639af
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:35:45 2012 -0700
This is a basic view only pref
imp/config/prefs.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/ee08d5ba16256c6cc048d1e0b8369f4be44639af
-----------------------------------------------------------------------
commit 2ca4b6408a11f5f07ef217e8eaf885472daf0613
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:36:44 2012 -0700
Make all minimal view prefs advanced
imp/config/prefs.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/2ca4b6408a11f5f07ef217e8eaf885472daf0613
-----------------------------------------------------------------------
commit 83918fb29572869ac0aefe46884401f019ef1bab
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 21:57:00 2012 -0700
[mms] Fix importing personal S/MIME certificate.
imp/docs/CHANGES | 1 +
imp/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/83918fb29572869ac0aefe46884401f019ef1bab
-----------------------------------------------------------------------
commit 8abf2a48be5ad331c70eb4ec39fb7b68ef3ba610
Merge: bc80cea 83918fb
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 4 23:39:28 2012 -0700
Merge branch 'master' into imp_6_1
Conflicts:
imp/config/prefs.php
imp/package.xml
framework/Core/js/prototype.js | 10 +-
framework/Core/lib/Horde/Core/Script/Package/Datejs.php | 2 +-
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 15 +
framework/Imap_Client/lib/Horde/Imap/Client.php | 8 -
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 123 +--
framework/Imap_Client/lib/Horde/Imap/Client/Base/Debug.php | 174 +++++
framework/Imap_Client/lib/Horde/Imap/Client/Base/Mailbox.php | 4 +
framework/Imap_Client/lib/Horde/Imap/Client/Cache.php | 35 +-
framework/Imap_Client/lib/Horde/Imap/Client/Ids/Map.php | 2 +
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 55 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Catenate.php | 4 +
framework/Imap_Client/lib/Horde/Imap/Client/Socket/ClientSort.php | 4 +
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 4 +-
framework/Imap_Client/package.xml | 53 +-
framework/Stream/lib/Horde/Stream/Temp.php | 12 +-
framework/Stream/package.xml | 38 +-
horde/templates/login/smartmobile.html.php | 4 -
imp/config/hooks.php.dist | 8 +-
imp/config/prefs.php | 79 +--
imp/docs/CHANGES | 7 +
imp/docs/INSTALL | 27 +-
imp/docs/PERFORMANCE | 16 +-
imp/js/dimpbase.js | 8 +-
imp/js/search.js | 10 +-
imp/lib/Crypt/Smime.php | 4 +-
imp/lib/Dynamic/Mailbox.php | 1 -
imp/lib/Imap.php | 21 +-
imp/lib/Imap/Acl.php | 45 +-
imp/lib/Imap/Tree.php | 2 +-
imp/lib/Mailbox.php | 4 +-
imp/lib/Prefs/Special/Acl.php | 8 +-
imp/package.xml | 4 +
imp/templates/prefs/smimeprivatekey.html.php | 5 +-
imp/templates/search/search.html.php | 8 +-
imp/templates/smime/import_key.html.php | 2 +-
imp/themes/default/graphics/delete.png | Bin 412 -> 408 bytes
imp/themes/default/screen.css | 40 +-
ingo/rule.php | 2 +-
ingo/templates/blacklist/blacklist.inc | 34 +-
ingo/templates/filters/footer.inc | 2 +-
ingo/templates/filters/header.inc | 23 +-
ingo/templates/filters/settings.inc | 2 +-
ingo/templates/rule/filter.inc | 8 +-
ingo/templates/rule/footer.inc | 46 +-
ingo/templates/rule/header.inc | 26 +-
ingo/templates/script/activate.inc | 2 +-
ingo/templates/script/header.inc | 2 +-
ingo/templates/script/script.inc | 2 +-
ingo/templates/whitelist/whitelist.inc | 22 +-
ingo/themes/default/screen.css | 14 +
50 files changed, 652 insertions(+), 379 deletions(-)
http://git.horde.org/horde-git/-/commit/8abf2a48be5ad331c70eb4ec39fb7b68ef3ba610
More information about the commits
mailing list