[commits] Horde branch redesign updated. e4ef2c3bf0e53547b696332af85dee1b2121f008
Jan Schneider
jan at horde.org
Tue Jun 26 14:25:21 UTC 2012
The branch "redesign" has been updated.
The following is a summary of the commits.
from: 18faba54ba2bc36745b540b90f8d683ce9441016
5599f30 Only override procmail variables if using Maildir (Bug #10113)
a59eab2 Bug #11227 Fix reveresed logic. Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
b43fd64 Improved algorithm for determining base subject text
a606283 [jan] Fix getViewLink() API method (Bug #11226).
005bf85 [mms] Only allow display of basic image types directly in browser.
e95e0ff Merge branch 'master' into develop
ff1c0a8 Revert "Fix botched merges."
b410d64 Don't attempt to logout if not yet logged in
f2c2fa0 Add Horde_Registry#clearAuthApp()
9eeccd0 Keep logintask information with the app data, not in the horde namespace
efa7400 Only logout if auth failure occurs in main authentication application
fa5f387 Log out of imp if we receive an authentication error from the IMAP server
51f6656 Revert "Don't attempt to logout if not yet logged in"
958d00d [mms] Fix patch for filtering on combination fields (Bug #11197).
4e3a99a Prepare release.
a1a5af4 Released ingo-2.0.9
9a83253 Development mode for ingo-2.0.10
08c699f Prepare release.
4764bca Released imp-5.0.22
f4973e2 Development mode for imp-5.0.23
076a3f7 Merge remote-tracking branch 'origin/master' into develop
4bc9be1 Update file list.
e4ef2c3 Merge branch 'develop' into redesign
-----------------------------------------------------------------------
commit 5599f3052996002509b579f2608cab16bc8eec20
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jun 21 09:15:49 2012 -0600
Only override procmail variables if using Maildir (Bug #10113)
ingo/config/backends.php | 12 ++++++------
ingo/lib/Script/Procmail.php | 21 +++++++++++++++++++++
2 files changed, 27 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/5599f3052996002509b579f2608cab16bc8eec20
-----------------------------------------------------------------------
commit a59eab2e4255dee39e1dece6da428ab141fd1a03
Author: maxime at chavagne.net <maxime at chavagne.net>
Date: Fri Jun 22 17:42:04 2012 -0400
Bug #11227 Fix reveresed logic.
Signed-off-by: Michael J Rubinsky <mrubinsk at horde.org>
ansel/lib/Api.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a59eab2e4255dee39e1dece6da428ab141fd1a03
-----------------------------------------------------------------------
commit b43fd641cb135e2b3a9c3f408f82ccb38987cd5b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 22 15:31:10 2012 -0600
Improved algorithm for determining base subject text
framework/Imap_Client/lib/Horde/Imap/Client/Utils.php | 23 ++---
framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php | 10 ++
2 files changed, 20 insertions(+), 13 deletions(-)
http://git.horde.org/horde-git/-/commit/b43fd641cb135e2b3a9c3f408f82ccb38987cd5b
-----------------------------------------------------------------------
commit a60628364dcca0ee7bb182b31b23b887e64ee1d4
Author: Jan Schneider <jan at horde.org>
Date: Sat Jun 23 13:34:58 2012 +0200
[jan] Fix getViewLink() API method (Bug #11226).
gollem/docs/CHANGES | 1 +
gollem/lib/Api.php | 17 +++++++++--------
gollem/package.xml | 2 ++
3 files changed, 12 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/a60628364dcca0ee7bb182b31b23b887e64ee1d4
-----------------------------------------------------------------------
commit 005bf859ca78a495a0756b7c681e7bbd26c65895
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 15:24:19 2012 -0600
[mms] Only allow display of basic image types directly in browser.
imp/docs/CHANGES | 1 +
imp/lib/Mime/Viewer/Images.php | 31 ++++++++++++++++++++++++-------
imp/package.xml | 2 ++
3 files changed, 27 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/005bf859ca78a495a0756b7c681e7bbd26c65895
-----------------------------------------------------------------------
commit e95e0ff02440dc17c62f87ce59a652180aea10ff
Merge: db9f2cc 005bf85
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 15:26:46 2012 -0600
Merge branch 'master' into develop
Conflicts:
gollem/package.xml
imp/lib/Mime/Viewer/Images.php
imp/package.xml
framework/Imap_Client/lib/Horde/Imap/Client/Utils.php | 23 +-
framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php | 10 +
gollem/docs/CHANGES | 1 +
gollem/lib/Api.php | 17 +-
gollem/package.xml | 5 +-
imp/docs/CHANGES | 1 +
imp/lib/Mime/Viewer/Images.php | 31 ++-
imp/package.xml | 60 +----
ingo/config/backends.php | 12 +-
ingo/lib/Script/Procmail.php | 21 ++
10 files changed, 89 insertions(+), 92 deletions(-)
http://git.horde.org/horde-git/-/commit/e95e0ff02440dc17c62f87ce59a652180aea10ff
-----------------------------------------------------------------------
commit ff1c0a8415a974362929fea07a12e54be1d50737
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 15:27:57 2012 -0600
Revert "Fix botched merges."
This reverts commit 9611207f3688474bea6648a109d53ad22195e687.
Conflicts:
imp/package.xml
ingo/package.xml
These are not botched merges. Per discussion on dev@ a while back, we
made the decision to specifically not add any changelog information to
package.xml since it causes a guaranteed merge conflict (another reason
that merging from master -> develop doesn't make sense).
This is why the --nopackage option to horde-components was added.
horde/package.xml | 8 +-------
imp/package.xml | 5 +----
ingo/package.xml | 5 +----
kronolith/package.xml | 15 ++-------------
nag/package.xml | 2 +-
turba/package.xml | 3 +--
whups/package.xml | 5 +++--
7 files changed, 10 insertions(+), 33 deletions(-)
http://git.horde.org/horde-git/-/commit/ff1c0a8415a974362929fea07a12e54be1d50737
-----------------------------------------------------------------------
commit b410d648c1639a095e21a0aaf3b45ab372db6e9b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 16:22:48 2012 -0600
Don't attempt to logout if not yet logged in
framework/Core/lib/Horde/ErrorHandler.php | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/b410d648c1639a095e21a0aaf3b45ab372db6e9b
-----------------------------------------------------------------------
commit f2c2fa0768a6aa2bdb093030eb822996a4b46217
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 16:52:04 2012 -0600
Add Horde_Registry#clearAuthApp()
framework/Core/lib/Horde/Registry.php | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f2c2fa0768a6aa2bdb093030eb822996a4b46217
-----------------------------------------------------------------------
commit 9eeccd09b2ee36df500032ef15d2399866fa50cd
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 16:54:33 2012 -0600
Keep logintask information with the app data, not in the horde namespace
framework/Core/lib/Horde/Core/LoginTasks.php | 2 +-
framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/9eeccd09b2ee36df500032ef15d2399866fa50cd
-----------------------------------------------------------------------
commit efa7400ee0814f7709222d291449c81d71ac894a
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 16:56:27 2012 -0600
Only logout if auth failure occurs in main authentication application
framework/Core/lib/Horde/ErrorHandler.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/efa7400ee0814f7709222d291449c81d71ac894a
-----------------------------------------------------------------------
commit fa5f38727b09abeca852493a0820a8f42d905af3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 17:00:00 2012 -0600
Log out of imp if we receive an authentication error from the IMAP server
imp/lib/Imap.php | 6 +++++-
imp/lib/Imap/Exception.php | 15 ++++++++++++---
2 files changed, 17 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/fa5f38727b09abeca852493a0820a8f42d905af3
-----------------------------------------------------------------------
commit 51f6656c5fb63092d68b0efc0e9c6d307d8d30e1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Jun 25 23:02:54 2012 -0600
Revert "Don't attempt to logout if not yet logged in"
This reverts commit b410d648c1639a095e21a0aaf3b45ab372db6e9b.
Conflicts:
framework/Core/lib/Horde/ErrorHandler.php
framework/Core/lib/Horde/ErrorHandler.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/51f6656c5fb63092d68b0efc0e9c6d307d8d30e1
-----------------------------------------------------------------------
commit 958d00d4fdbe5221594c6c574ff9a1988d223bbf
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 11:59:54 2012 +0200
[mms] Fix patch for filtering on combination fields (Bug #11197).
ingo/docs/CHANGES | 1 +
ingo/package.xml | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/958d00d4fdbe5221594c6c574ff9a1988d223bbf
-----------------------------------------------------------------------
commit 4e3a99a0a59d5b64c417822c6337d860edba56a2
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 12:02:57 2012 +0200
Prepare release.
ingo/docs/RELEASE_NOTES | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
http://git.horde.org/horde-git/-/commit/4e3a99a0a59d5b64c417822c6337d860edba56a2
-----------------------------------------------------------------------
commit a1a5af4b2886917af014d7c0ea23cb86d64d18ea
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 12:04:08 2012 +0200
Released ingo-2.0.9
ingo/docs/CHANGES | 6 +++---
ingo/lib/Application.php | 2 +-
ingo/package.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/a1a5af4b2886917af014d7c0ea23cb86d64d18ea
-----------------------------------------------------------------------
commit 9a83253bfc1ea2b445b9c4fae5d1b53da8202eab
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 12:04:17 2012 +0200
Development mode for ingo-2.0.10
ingo/docs/CHANGES | 6 ++++++
ingo/lib/Application.php | 2 +-
ingo/package.xml | 21 ++++++++++++++++-----
3 files changed, 23 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/9a83253bfc1ea2b445b9c4fae5d1b53da8202eab
-----------------------------------------------------------------------
commit 08c699f744b6d2be1a5f3a2ba7203f4631b4c5dc
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 13:30:01 2012 +0200
Prepare release.
imp/docs/CHANGES | 2 +-
imp/docs/RELEASE_NOTES | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/08c699f744b6d2be1a5f3a2ba7203f4631b4c5dc
-----------------------------------------------------------------------
commit 4764bca74481622b39dd1d9b81d62882128255b3
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 13:31:53 2012 +0200
Released imp-5.0.22
imp/docs/CHANGES | 6 +++---
imp/lib/Application.php | 2 +-
imp/package.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/4764bca74481622b39dd1d9b81d62882128255b3
-----------------------------------------------------------------------
commit f4973e2d388b4a7b4057eefad2e4b54e7cfd4b3b
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 13:32:02 2012 +0200
Development mode for imp-5.0.23
imp/docs/CHANGES | 6 ++++++
imp/lib/Application.php | 2 +-
imp/package.xml | 22 ++++++++++++++++------
3 files changed, 23 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/f4973e2d388b4a7b4057eefad2e4b54e7cfd4b3b
-----------------------------------------------------------------------
commit 076a3f7e7a276058dc5e4d1a972a80ead7dcf2af
Merge: 51f6656 f4973e2
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 16:15:45 2012 +0200
Merge remote-tracking branch 'origin/master' into develop
Conflicts:
imp/lib/Application.php
imp/package.xml
ingo/docs/CHANGES
ingo/lib/Application.php
ingo/package.xml
imp/docs/CHANGES | 10 ++++++++--
imp/docs/RELEASE_NOTES | 26 +++++++++++++-------------
imp/package.xml | 15 ++++++++++++++-
ingo/docs/CHANGES | 13 ++++++++++---
ingo/docs/RELEASE_NOTES | 18 +++++++++---------
ingo/package.xml | 16 +++++++++++++++-
6 files changed, 69 insertions(+), 29 deletions(-)
http://git.horde.org/horde-git/-/commit/076a3f7e7a276058dc5e4d1a972a80ead7dcf2af
-----------------------------------------------------------------------
commit 4bc9be1d2c22a31e389762004c5ddd75abdbed23
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 16:17:35 2012 +0200
Update file list.
horde/package.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/4bc9be1d2c22a31e389762004c5ddd75abdbed23
-----------------------------------------------------------------------
commit e4ef2c3bf0e53547b696332af85dee1b2121f008
Merge: 18faba5 4bc9be1
Author: Jan Schneider <jan at horde.org>
Date: Tue Jun 26 16:25:05 2012 +0200
Merge branch 'develop' into redesign
Conflicts:
horde/package.xml
framework/Core/lib/Horde/Core/LoginTasks.php | 2 +-
framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php | 4 +-
framework/Core/lib/Horde/ErrorHandler.php | 6 +-
framework/Core/lib/Horde/Registry.php | 23 ++
framework/Imap_Client/lib/Horde/Imap/Client/Utils.php | 23 +-
framework/Imap_Client/test/Horde/Imap/Client/SubjectParseTest.php | 10 +
gollem/docs/CHANGES | 1 +
gollem/lib/Api.php | 17 +-
gollem/package.xml | 5 +-
horde/package.xml | 28 +-
imp/docs/CHANGES | 9 +-
imp/docs/RELEASE_NOTES | 26 +-
imp/lib/Imap.php | 6 +-
imp/lib/Imap/Exception.php | 15 +-
imp/lib/Mime/Viewer/Images.php | 31 ++-
imp/package.xml | 72 +----
ingo/config/backends.php | 12 +-
ingo/docs/CHANGES | 13 +-
ingo/docs/RELEASE_NOTES | 18 +-
ingo/lib/Script/Procmail.php | 21 ++
ingo/package.xml | 21 +-
kronolith/package.xml | 15 +-
nag/package.xml | 2 +-
turba/package.xml | 3 +-
whups/package.xml | 5 +-
25 files changed, 225 insertions(+), 163 deletions(-)
http://git.horde.org/horde-git/-/commit/e4ef2c3bf0e53547b696332af85dee1b2121f008
More information about the commits
mailing list