[commits] Horde branch master updated. af3cec27bb9ea4ceeb84a3d5015d92a4c9686d02

[Michael J. Rubinsky]

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

from: 7a02ac7f51a794cc6c6c71206a64cc224f7f797a

2f4ac16 We only have one channel type in Jonah now.
84eea69 Simplify.
07a2e27 Remove checks for channel_type, clean up.
af3cec2 Add new migration, update package.xml

Summary: http://github.com/horde/horde/compare/7a02ac7f51a794cc6c6c71206a64cc224f7f797a...af3cec27bb9ea4ceeb84a3d5015d92a4c9686d02

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

commit 2f4ac16d5a890d41a199c9d0bd3fbe7b10a9e14f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 20 09:14:07 2016 -0500

    We only have one channel type in Jonah now.

 jonah/config/conf.xml            |  7 -------
 jonah/lib/Api.php                |  2 +-
 jonah/lib/Application.php        | 20 ++++++++------------
 jonah/lib/Jonah.php              | 29 +++++++----------------------
 jonah/lib/View/ChannelDelete.php |  2 +-
 jonah/lib/View/StoryDelete.php   |  2 +-
 jonah/lib/View/StoryEdit.php     |  2 +-
 jonah/lib/View/StoryList.php     |  4 ++--
 jonah/lib/View/TagSearchList.php |  2 +-
 9 files changed, 22 insertions(+), 48 deletions(-)

http://github.com/horde/horde/commit/2f4ac16d5a890d41a199c9d0bd3fbe7b10a9e14f

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

commit 84eea69da26cd0aa48dc423c33fe80d70d626182
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 20 09:14:56 2016 -0500

    Simplify.

 jonah/lib/View/StoryList.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

http://github.com/horde/horde/commit/84eea69da26cd0aa48dc423c33fe80d70d626182

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

commit 07a2e27ca0f1645fe0e1e27ba2e54f8dfea3a86f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 20 09:41:01 2016 -0500

    Remove checks for channel_type, clean up.

 jonah/channels/index.php                  | 18 +++-------
 jonah/lib/Block/NewsPopular.php           | 39 +++++++++++---------
 jonah/lib/Driver/Sql.php                  | 14 +++-----
 jonah/lib/Form/Feed.php                   |  7 ----
 jonah/lib/Jonah.php                       | 60 ++-----------------------------
 jonah/lib/View/ChannelEdit.php            |  2 +-
 jonah/lib/View/ChannelList.php            | 12 ++-----
 jonah/lib/View/StoryList.php              |  2 +-
 jonah/lib/View/TagSearchList.php          |  8 ++---
 jonah/templates/view/channellist.html.php |  2 --
 10 files changed, 44 insertions(+), 120 deletions(-)

http://github.com/horde/horde/commit/07a2e27ca0f1645fe0e1e27ba2e54f8dfea3a86f

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

commit af3cec27bb9ea4ceeb84a3d5015d92a4c9686d02
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Dec 20 09:41:37 2016 -0500

    Add new migration, update package.xml

 .../migration/3_jonah_upgrade_dropnoninternal.php  | 28 ++++++++++++++++++++++
 jonah/package.xml                                  | 11 ++++-----
 2 files changed, 32 insertions(+), 7 deletions(-)
 create mode 100644 jonah/migration/3_jonah_upgrade_dropnoninternal.php

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