[commits] Horde branch FRAMEWORK_5_2 updated. 0a15d52657cb735b13fa5723bc74a737f5cca1b4

Tue Jul 8 18:10:01 UTC 2014

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

from: 06fa354b8576ac12816ed5428796418b030f839c

804bdba Prepare release.
9674e2b Released trean-1.1.0RC1
decb9a6 Development mode for trean-1.1.0RC2
56dc53c Fix converting foldernames to tags during import.
fbae93b Import the 'tags' property as tags also.
04ba940 Clean up exception handling, phpdoc.
5cf5e22 PHPDOC, clean up exception catching/handling.
0eb2ee2 Simplify.
f8754c7 ws
7aaf79f Update hu translation.
0edccf8 Fix version.
0a15d52 Prepare release.

Summary: http://github.com/horde/horde/compare/06fa354b8576ac12816ed5428796418b030f839c...0a15d52657cb735b13fa5723bc74a737f5cca1b4

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

commit 804bdba2fe1f4fc78e0a79de4381d8b49f60f343
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 1 14:18:36 2014 +0200

    Prepare release.

 trean/docs/RELEASE_NOTES |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/804bdba2fe1f4fc78e0a79de4381d8b49f60f343

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

commit 9674e2b7b922baf790d31647fc4aaa0ed7afb154
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 1 14:21:54 2014 +0200

    Released trean-1.1.0RC1

 trean/composer.json       |   48 ++++++++++++++++++++++----------------------
 trean/docs/CHANGES        |    6 ++--
 trean/lib/Application.php |    2 +-
 trean/package.xml         |   18 ++++++++++++----
 4 files changed, 41 insertions(+), 33 deletions(-)

http://github.com/horde/horde/commit/9674e2b7b922baf790d31647fc4aaa0ed7afb154

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

commit decb9a6e11498e6c835546987b32557e09b315f1
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 1 14:22:00 2014 +0200

    Development mode for trean-1.1.0RC2

    Conflicts:
    	trean/package.xml

 trean/docs/CHANGES        |    6 ++++++
 trean/lib/Application.php |    2 +-
 trean/package.xml         |   20 +++++++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/decb9a6e11498e6c835546987b32557e09b315f1

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

commit 56dc53c461cc20a33bca989864c51c2062f10f5a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Jul 5 15:03:49 2014 -0400

    Fix converting foldernames to tags during import.

    Conflicts:
    	trean/lib/Data/Json.php

 trean/lib/Data/Json.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/56dc53c461cc20a33bca989864c51c2062f10f5a

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

commit fbae93bc8a01aac0523361e2a58a1e8f61765904
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Jul 5 15:25:15 2014 -0400

    Import the 'tags' property as tags also.

 trean/lib/Data/Json.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/fbae93bc8a01aac0523361e2a58a1e8f61765904

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

commit 04ba940210c4329a077b47a5889463949ce7ceaa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 6 13:43:38 2014 -0400

    Clean up exception handling, phpdoc.

 trean/lib/Tagger.php |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/04ba940210c4329a077b47a5889463949ce7ceaa

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

commit 5cf5e22a9204a537860a59bc263d69d9d62a97fc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 6 14:49:33 2014 -0400

    PHPDOC, clean up exception catching/handling.

 trean/app/controllers/DeleteBookmark.php |    2 +-
 trean/app/controllers/SaveBookmark.php   |    3 +-
 trean/edit.php                           |    2 +-
 trean/favicon.php                        |    6 ++-
 trean/lib/Bookmarks.php                  |   80 +++++++++++++++++++++++++----
 trean/lib/TagBrowser.php                 |    2 +-
 6 files changed, 78 insertions(+), 17 deletions(-)

http://github.com/horde/horde/commit/5cf5e22a9204a537860a59bc263d69d9d62a97fc

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

commit 0eb2ee2b20a0cf621603766077afd3924bb670b5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 6 14:54:50 2014 -0400

    Simplify.

 trean/lib/Bookmarks.php |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

http://github.com/horde/horde/commit/0eb2ee2b20a0cf621603766077afd3924bb670b5

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

commit f8754c78957df98c3ad3b47680d2b2e6ee99e7f3
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sun Jul 6 14:56:08 2014 -0400

    ws

 trean/lib/Bookmarks.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

http://github.com/horde/horde/commit/f8754c78957df98c3ad3b47680d2b2e6ee99e7f3

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

commit 7aaf79fad040a974b1419171421118d8358ec7cd
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 8 19:55:11 2014 +0200

    Update hu translation.

 trean/locale/hu/LC_MESSAGES/trean.mo |  Bin 71817 -> 67243 bytes
 trean/locale/hu/LC_MESSAGES/trean.po |   69 +++++++++++++++++++++++++++-------
 2 files changed, 55 insertions(+), 14 deletions(-)

http://github.com/horde/horde/commit/7aaf79fad040a974b1419171421118d8358ec7cd

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

commit 0edccf8b55c794fc7b52dfc22c8ba3ce1e56258b
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 8 20:01:34 2014 +0200

    Fix version.

 trean/docs/CHANGES |    2 +-
 trean/package.xml  |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

http://github.com/horde/horde/commit/0edccf8b55c794fc7b52dfc22c8ba3ce1e56258b

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

commit 0a15d52657cb735b13fa5723bc74a737f5cca1b4
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 8 20:09:45 2014 +0200

    Prepare release.

    No idea why I originally released from master.

 trean/docs/RELEASE_NOTES |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/0a15d52657cb735b13fa5723bc74a737f5cca1b4