Permalink
Browse files

Merge branch 'master' of github.com:cosent/plonesocial.suite

Conflicts:
	.gitignore
  • Loading branch information...
2 parents e00a11f + 40a1786 commit dd76386d597fcd8de69d4b573e4c344f55586d8e @hvelarde hvelarde committed Oct 15, 2012
Showing with 56 additions and 21 deletions.
  1. +31 −7 README.rst
  2. +1 −0 README.txt
  3. +4 −13 buildout.cfg
  4. +1 −1 setup.py
  5. +19 −0 staticlxml-travis.cfg
View
38 README.rst
@@ -1,17 +1,20 @@
-.. contents::
+.. image:: https://secure.travis-ci.org/cosent/plonesocial.suite.png
+ :target: http://travis-ci.org/cosent/plonesocial.suite
+
Introduction
============
-Plonesocial.suite is an integrated set of social business add-ons for Plone.
+The PloneSocial suite is an integrated set of social business add-ons for Plone.
-plonesocial.suite provides a full microblogging solution,
+PloneSocial provides a full microblogging solution,
including activity streams, user profiles and follow/unfollow functionality.
-This package is targeted at end-users and integrators.
plonesocial.suite
-=================
+-----------------
+
+This package is targeted at end-users and integrators.
This is the integration package for all the various plonesocial.* packages
into a single consistent user experience that's easy to install.
@@ -20,7 +23,7 @@ into a single consistent user experience that's easy to install.
Installation
============
-Add the plonesocial.suite egg to your buildout::
+Add the ``plonesocial.suite`` egg to your buildout::
[instance]
eggs =
@@ -37,6 +40,26 @@ If you need some demo content to play with, you can run the
"Plonesocial Suite (demo)" profile from GenericSetup.
+Features and Roadmap
+--------------------
+
+The 0.4 release of plonesocial.suite provides:
+
+* microblog status updates
+* personal profile with follow/unfollow
+ - and following/followers social graph views
+* activitystream, with integrated:
+ - status updates
+ - content creation
+ - discussion replies
+ - hashtag support
+ - filter by "following"
+
+The slideshow_ of the PloneSocial presentation at PloneConf2012 is available on Slideshare.
+
+An extensive roadmap_ for the plonesocial suite is available on github.
+
+
Plonesocial
===========
@@ -67,4 +90,5 @@ plonesocial.like
.. _plonesocial.activitystream: https://github.com/cosent/plonesocial.activitystream
.. _plonesocial.network: https://github.com/cosent/plonesocial.network
.. _plonesocial.buildout: https://github.com/cosent/plonesocial.buildout
-
+.. _roadmap: https://github.com/cosent/plonesocial.suite/wiki
+.. _slideshow: http://www.slideshare.net/GuidoStevens/plone-goes-social
View
1 README.txt
View
17 buildout.cfg
@@ -1,18 +1,9 @@
[buildout]
extends =
- http://svn.plone.org/svn/collective/buildout/plonetest/plone-4.0.x.cfg
+ http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
package-name = plonesocial.suite
+package-extras = [test]
-parts += omelette
-
-[test]
-recipe = zc.recipe.testrunner
-eggs =
- ${instance:eggs}
- plonesocial.suite [test]
-defaults = ['-s', '${buildout:package-name}']
-
-[omelette]
-recipe = collective.recipe.omelette
-eggs = ${instance:eggs}
+[versions]
+zc.buildout = 1.6.3
View
2 setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '0.4.1'
+version = '0.5dev'
long_description = (
open('README.rst').read()
View
19 staticlxml-travis.cfg
@@ -0,0 +1,19 @@
+[buildout]
+extends =
+ http://svn.plone.org/svn/collective/buildout/plonetest/travis-4.x.cfg
+eggs += ${lxml:egg}
+
+package-name = plonesocial.suite
+package-extras = [test]
+test-eggs =
+ plonesocial.suite
+ plonesocial.microblog
+ plonesocial.activitystream
+ plonesocial.network
+
+[versions]
+zc.buildout = 1.6.3
+
+[lxml]
+recipe = z3c.recipe.staticlxml
+egg = lxml

0 comments on commit dd76386

Please sign in to comment.