[commits] Horde branch develop updated. 33a61c55a1c6ccc0d56049c4c5d84ce689627ce9
Jan Schneider
jan at horde.org
Tue May 15 17:35:43 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 91bffe4f2452aa4482475206114d9118ce54e737
18a835f Don't hide text within <> in minimal view.
fcaf22b We don't want linebreaks either
3795b93 Fix logic.
ddb5b4a [jan] Fix showing blacklist option to mark message as deleted (Bug #11186).
1228a68 Escape content (Bug #11189).
e6f897f Prepare release.
9e9c19d Released kronolith-3.0.17
d37a535 Development mode for kronolith-3.0.18
5600c14 Sanity checking for bad/missing mailbox
3471f20 Update nl translation.
67b3223 [jan] Fix redirection after setting gallery password (thpo+horde at dotrc.de, Bug #11195).
33a61c5 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit 18a835f36055fbf59643dc38d55b6c8d196481ee
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed May 9 14:35:51 2012 -0600
Don't hide text within <> in minimal view.
imp/lib/Mime/Viewer/Plain.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/18a835f36055fbf59643dc38d55b6c8d196481ee
-----------------------------------------------------------------------
commit fcaf22b3f07f527a602f7a2bb9480f13cab26325
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed May 9 14:50:16 2012 -0600
We don't want linebreaks either
imp/lib/Mime/Viewer/Plain.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/fcaf22b3f07f527a602f7a2bb9480f13cab26325
-----------------------------------------------------------------------
commit 3795b93fbc43d895fab04c37c7f7017afc056b73
Author: Jan Schneider <jan at horde.org>
Date: Thu May 10 10:18:42 2012 +0200
Fix logic.
ingo/blacklist.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/3795b93fbc43d895fab04c37c7f7017afc056b73
-----------------------------------------------------------------------
commit ddb5b4a59bc708b0d366c91bd7a9245930248347
Author: Jan Schneider <jan at horde.org>
Date: Thu May 10 10:22:58 2012 +0200
[jan] Fix showing blacklist option to mark message as deleted (Bug #11186).
ingo/docs/CHANGES | 1 +
ingo/package.xml | 2 ++
ingo/templates/blacklist/blacklist.inc | 2 +-
3 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ddb5b4a59bc708b0d366c91bd7a9245930248347
-----------------------------------------------------------------------
commit 1228a6825a8dab3333d0a8c8986fc10d1f3d11b2
Author: Jan Schneider <jan at horde.org>
Date: Sat May 12 13:32:19 2012 +0200
Escape content (Bug #11189).
kronolith/docs/CHANGES | 2 ++
kronolith/js/kronolith.js | 10 +++++-----
kronolith/package.xml | 2 ++
3 files changed, 9 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/1228a6825a8dab3333d0a8c8986fc10d1f3d11b2
-----------------------------------------------------------------------
commit e6f897f2c030ba0e7851b59f5b8fe1659feb33d9
Author: Jan Schneider <jan at horde.org>
Date: Mon May 14 10:18:41 2012 +0200
Prepare release.
kronolith/docs/RELEASE_NOTES | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/e6f897f2c030ba0e7851b59f5b8fe1659feb33d9
-----------------------------------------------------------------------
commit 9e9c19d1ebbe03e0c2d566a6dd478973911cda00
Author: Jan Schneider <jan at horde.org>
Date: Mon May 14 10:23:28 2012 +0200
Released kronolith-3.0.17
kronolith/docs/CHANGES | 6 +++---
kronolith/lib/Application.php | 2 +-
kronolith/package.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/9e9c19d1ebbe03e0c2d566a6dd478973911cda00
-----------------------------------------------------------------------
commit d37a5354e9645f2e1d628ef4fe3e6f68cdbd4bac
Author: Jan Schneider <jan at horde.org>
Date: Mon May 14 10:23:36 2012 +0200
Development mode for kronolith-3.0.18
kronolith/docs/CHANGES | 6 ++++++
kronolith/lib/Application.php | 2 +-
kronolith/package.xml | 25 ++++++++++++++++---------
3 files changed, 23 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/d37a5354e9645f2e1d628ef4fe3e6f68cdbd4bac
-----------------------------------------------------------------------
commit 5600c14fd1eb56f1dddac8825e35156ff8b6dd19
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon May 14 14:02:46 2012 -0600
Sanity checking for bad/missing mailbox
imp/mailbox.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/5600c14fd1eb56f1dddac8825e35156ff8b6dd19
-----------------------------------------------------------------------
commit 3471f20a94219b1cd54a1d7db85a5e5b5f706715
Author: Jan Schneider <jan at horde.org>
Date: Tue May 15 18:53:40 2012 +0200
Update nl translation.
ingo/locale/nl/LC_MESSAGES/ingo.mo | Bin 73168 -> 73169 bytes
ingo/locale/nl/LC_MESSAGES/ingo.po | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/3471f20a94219b1cd54a1d7db85a5e5b5f706715
-----------------------------------------------------------------------
commit 67b32237c21274af8c496a957b815f345fc37a59
Author: Jan Schneider <jan at horde.org>
Date: Tue May 15 19:25:13 2012 +0200
[jan] Fix redirection after setting gallery password (thpo+horde at dotrc.de, Bug #11195).
ansel/docs/CHANGES | 2 ++
ansel/package.xml | 4 ++--
ansel/protect.php | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/67b32237c21274af8c496a957b815f345fc37a59
-----------------------------------------------------------------------
commit 33a61c55a1c6ccc0d56049c4c5d84ce689627ce9
Merge: 91bffe4 67b3223
Author: Jan Schneider <jan at horde.org>
Date: Tue May 15 19:34:46 2012 +0200
Merge branch 'master' into develop
Conflicts:
ansel/package.xml
imp/lib/Mime/Viewer/Plain.php
imp/mailbox.php
ingo/blacklist.php
ingo/package.xml
kronolith/js/kronolith.js
kronolith/lib/Application.php
kronolith/package.xml
ansel/docs/CHANGES | 2 ++
ansel/package.xml | 13 +++++++++++++
ansel/protect.php | 2 ++
imp/lib/Mime/Viewer/Plain.php | 9 +++++++++
imp/mailbox.php | 12 ++++++------
ingo/blacklist.php | 5 +++--
ingo/docs/CHANGES | 1 +
ingo/locale/nl/LC_MESSAGES/ingo.mo | Bin 73168 -> 73169 bytes
ingo/locale/nl/LC_MESSAGES/ingo.po | 4 ++--
ingo/package.xml | 1 +
ingo/templates/blacklist/blacklist.inc | 2 +-
kronolith/docs/CHANGES | 10 +++++++++-
kronolith/docs/RELEASE_NOTES | 10 +++++++---
kronolith/js/kronolith.js | 8 ++++----
kronolith/package.xml | 16 +++++++++++++++-
15 files changed, 75 insertions(+), 20 deletions(-)
http://git.horde.org/horde-git/-/commit/33a61c55a1c6ccc0d56049c4c5d84ce689627ce9
More information about the commits
mailing list