Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Conflicts:
	.travis.yml
  • Loading branch information...
commit 2df21dddfac1fbe88f8f0b71c69309b80aca05be 2 parents e3fdbe4 + 71d11cd
@hvelarde hvelarde authored
Showing with 8 additions and 1 deletion.
  1. +1 −0  .gitignore
  2. +2 −1  setup.py
  3. 0  { → src}/plonesocial/__init__.py
  4. 0  { → src}/plonesocial/suite/__init__.py
  5. 0  {plonesocial/suite/tests → src/plonesocial/suite/browser}/__init__.py
  6. 0  { → src}/plonesocial/suite/browser/configure.zcml
  7. 0  { → src}/plonesocial/suite/browser/interfaces.py
  8. 0  { → src}/plonesocial/suite/browser/navigation.pt
  9. 0  { → src}/plonesocial/suite/browser/navigation.py
  10. 0  { → src}/plonesocial/suite/browser/stylesheets/suite.css
  11. 0  { → src}/plonesocial/suite/configure.zcml
  12. 0  { → src}/plonesocial/suite/profiles.zcml
  13. 0  { → src}/plonesocial/suite/profiles/default/browserlayer.xml
  14. 0  { → src}/plonesocial/suite/profiles/default/cssregistry.xml
  15. 0  { → src}/plonesocial/suite/profiles/default/metadata.xml
  16. 0  { → src}/plonesocial/suite/profiles/default/plonesocial.suite_various.txt
  17. 0  { → src}/plonesocial/suite/profiles/default/portlets.xml
  18. 0  { → src}/plonesocial/suite/profiles/default/registry.xml
  19. 0  { → src}/plonesocial/suite/profiles/default/types/Document.xml
  20. 0  { → src}/plonesocial/suite/profiles/default/types/Event.xml
  21. 0  { → src}/plonesocial/suite/profiles/default/types/News_Item.xml
  22. 0  { → src}/plonesocial/suite/profiles/demo/avatars/allan_neece.jpg
  23. 0  { → src}/plonesocial/suite/profiles/demo/avatars/christian_gast.jpeg
  24. 0  { → src}/plonesocial/suite/profiles/demo/avatars/christian_stoney.jpg
  25. 0  { → src}/plonesocial/suite/profiles/demo/avatars/clare_presler.jpg
  26. 0  { → src}/plonesocial/suite/profiles/demo/avatars/clayton_primavera.jpg
  27. 0  { → src}/plonesocial/suite/profiles/demo/avatars/dollie_nocera.jpg
  28. 0  { → src}/plonesocial/suite/profiles/demo/avatars/esmeralda_claassen.jpg
  29. 0  { → src}/plonesocial/suite/profiles/demo/avatars/fernando_poulter.png
  30. 0  { → src}/plonesocial/suite/profiles/demo/avatars/guy_hachey.jpg
  31. 0  { → src}/plonesocial/suite/profiles/demo/avatars/jamie_jacko.png
  32. 0  { → src}/plonesocial/suite/profiles/demo/avatars/jamie_sylvest.jpg
  33. 0  { → src}/plonesocial/suite/profiles/demo/avatars/jesse_shaikh.jpg
  34. 0  { → src}/plonesocial/suite/profiles/demo/avatars/kurt_silvio.jpg
  35. 0  { → src}/plonesocial/suite/profiles/demo/avatars/lance_stockstill.jpg
  36. 0  { → src}/plonesocial/suite/profiles/demo/avatars/neil_wichmann.jpg
  37. 0  { → src}/plonesocial/suite/profiles/demo/avatars/pearlie_whitby.jpeg
  38. 0  { → src}/plonesocial/suite/profiles/demo/avatars/rosalinda_roache.jpeg
  39. 0  { → src}/plonesocial/suite/profiles/demo/metadata.xml
  40. 0  { → src}/plonesocial/suite/profiles/demo/plonesocial.suite_demo.txt
  41. 0  { → src}/plonesocial/suite/setuphandlers.py
  42. 0  { → src}/plonesocial/suite/testing.py
  43. 0  {plonesocial/suite/browser → src/plonesocial/suite/tests}/__init__.py
  44. 0  { → src}/plonesocial/suite/tests/test_example.py
  45. +5 −0 travis.cfg
View
1  .gitignore
@@ -12,3 +12,4 @@ include/
lib/
parts/
var/
+dist/
View
3  setup.py
@@ -28,7 +28,8 @@
author_email='guido.stevens@cosent.net',
url='http://github.com/cosent/plonesocial.suite',
license='gpl',
- packages=find_packages(exclude=['ez_setup']),
+ packages=find_packages('src', exclude=['ez_setup']),
+ package_dir={'': 'src'},
namespace_packages=['plonesocial'],
include_package_data=True,
zip_safe=False,
View
0  plonesocial/__init__.py → src/plonesocial/__init__.py
File renamed without changes
View
0  plonesocial/suite/__init__.py → src/plonesocial/suite/__init__.py
File renamed without changes
View
0  plonesocial/suite/tests/__init__.py → src/plonesocial/suite/browser/__init__.py
File renamed without changes
View
0  plonesocial/suite/browser/configure.zcml → src/plonesocial/suite/browser/configure.zcml
File renamed without changes
View
0  plonesocial/suite/browser/interfaces.py → src/plonesocial/suite/browser/interfaces.py
File renamed without changes
View
0  plonesocial/suite/browser/navigation.pt → src/plonesocial/suite/browser/navigation.pt
File renamed without changes
View
0  plonesocial/suite/browser/navigation.py → src/plonesocial/suite/browser/navigation.py
File renamed without changes
View
0  ...ocial/suite/browser/stylesheets/suite.css → ...ocial/suite/browser/stylesheets/suite.css
File renamed without changes
View
0  plonesocial/suite/configure.zcml → src/plonesocial/suite/configure.zcml
File renamed without changes
View
0  plonesocial/suite/profiles.zcml → src/plonesocial/suite/profiles.zcml
File renamed without changes
View
0  ...l/suite/profiles/default/browserlayer.xml → ...l/suite/profiles/default/browserlayer.xml
File renamed without changes
View
0  ...al/suite/profiles/default/cssregistry.xml → ...al/suite/profiles/default/cssregistry.xml
File renamed without changes
View
0  ...ocial/suite/profiles/default/metadata.xml → ...ocial/suite/profiles/default/metadata.xml
File renamed without changes
View
0  ...les/default/plonesocial.suite_various.txt → ...les/default/plonesocial.suite_various.txt
File renamed without changes
View
0  ...ocial/suite/profiles/default/portlets.xml → ...ocial/suite/profiles/default/portlets.xml
File renamed without changes
View
0  ...ocial/suite/profiles/default/registry.xml → ...ocial/suite/profiles/default/registry.xml
File renamed without changes
View
0  ...suite/profiles/default/types/Document.xml → ...suite/profiles/default/types/Document.xml
File renamed without changes
View
0  ...al/suite/profiles/default/types/Event.xml → ...al/suite/profiles/default/types/Event.xml
File renamed without changes
View
0  ...uite/profiles/default/types/News_Item.xml → ...uite/profiles/default/types/News_Item.xml
File renamed without changes
View
0  ...ite/profiles/demo/avatars/allan_neece.jpg → ...ite/profiles/demo/avatars/allan_neece.jpg
File renamed without changes
View
0  ...profiles/demo/avatars/christian_gast.jpeg → ...profiles/demo/avatars/christian_gast.jpeg
File renamed without changes
View
0  ...rofiles/demo/avatars/christian_stoney.jpg → ...rofiles/demo/avatars/christian_stoney.jpg
File renamed without changes
View
0  ...e/profiles/demo/avatars/clare_presler.jpg → ...e/profiles/demo/avatars/clare_presler.jpg
File renamed without changes
View
0  ...ofiles/demo/avatars/clayton_primavera.jpg → ...ofiles/demo/avatars/clayton_primavera.jpg
File renamed without changes
View
0  ...e/profiles/demo/avatars/dollie_nocera.jpg → ...e/profiles/demo/avatars/dollie_nocera.jpg
File renamed without changes
View
0  ...files/demo/avatars/esmeralda_claassen.jpg → ...files/demo/avatars/esmeralda_claassen.jpg
File renamed without changes
View
0  ...rofiles/demo/avatars/fernando_poulter.png → ...rofiles/demo/avatars/fernando_poulter.png
File renamed without changes
View
0  ...uite/profiles/demo/avatars/guy_hachey.jpg → ...uite/profiles/demo/avatars/guy_hachey.jpg
File renamed without changes
View
0  ...ite/profiles/demo/avatars/jamie_jacko.png → ...ite/profiles/demo/avatars/jamie_jacko.png
File renamed without changes
View
0  ...e/profiles/demo/avatars/jamie_sylvest.jpg → ...e/profiles/demo/avatars/jamie_sylvest.jpg
File renamed without changes
View
0  ...te/profiles/demo/avatars/jesse_shaikh.jpg → ...te/profiles/demo/avatars/jesse_shaikh.jpg
File renamed without changes
View
0  ...ite/profiles/demo/avatars/kurt_silvio.jpg → ...ite/profiles/demo/avatars/kurt_silvio.jpg
File renamed without changes
View
0  ...rofiles/demo/avatars/lance_stockstill.jpg → ...rofiles/demo/avatars/lance_stockstill.jpg
File renamed without changes
View
0  ...e/profiles/demo/avatars/neil_wichmann.jpg → ...e/profiles/demo/avatars/neil_wichmann.jpg
File renamed without changes
View
0  ...profiles/demo/avatars/pearlie_whitby.jpeg → ...profiles/demo/avatars/pearlie_whitby.jpeg
File renamed without changes
View
0  ...ofiles/demo/avatars/rosalinda_roache.jpeg → ...ofiles/demo/avatars/rosalinda_roache.jpeg
File renamed without changes
View
0  plonesocial/suite/profiles/demo/metadata.xml → ...nesocial/suite/profiles/demo/metadata.xml
File renamed without changes
View
0  .../profiles/demo/plonesocial.suite_demo.txt → .../profiles/demo/plonesocial.suite_demo.txt
File renamed without changes
View
0  plonesocial/suite/setuphandlers.py → src/plonesocial/suite/setuphandlers.py
File renamed without changes
View
0  plonesocial/suite/testing.py → src/plonesocial/suite/testing.py
File renamed without changes
View
0  plonesocial/suite/browser/__init__.py → src/plonesocial/suite/tests/__init__.py
File renamed without changes
View
0  plonesocial/suite/tests/test_example.py → src/plonesocial/suite/tests/test_example.py
File renamed without changes
View
5 travis.cfg
@@ -4,6 +4,11 @@ extends =
package-name = plonesocial.suite
package-extras = [test]
+test-eggs =
+ plonesocial.suite
+ plonesocial.microblog
+ plonesocial.activitystream
+ plonesocial.network
[versions]
zc.buildout = 1.6.3
Please sign in to comment.
Something went wrong with that request. Please try again.