Skip to content

Commit

Permalink
Merge 1e4c195 into 47c5ef5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesse Stippel committed May 28, 2019
2 parents 47c5ef5 + 1e4c195 commit 3a513d1
Show file tree
Hide file tree
Showing 63 changed files with 1,052 additions and 806 deletions.
43 changes: 31 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,44 +1,63 @@
# Defaults

.*.cfg
.coverage
*.egg
*.EGG
*.egg-info
*.EGG-INFO
*.log
*.mo
*.py?
*.pyc
*.pyo
*.swp
# dirs
*.tmp*

# Dirs

bin/
build/
buildout-cache/
develop-eggs/
dist/
downloads/
eggs/
fake-eggs/
htmlcov/
include/
lib/
local/
node_modules/
parts/
test.plone_addon/
var/
# files
share/
.idea/

# Files

.installed.cfg
.mr.developer.cfg
Gruntfile.js
lib64
log.html
output.xml
package.json
pip-selfcheck.json
package-lock.json
report.html
.vscode/
# excludes

# Excludes

!.coveragerc
!.editorconfig
!.gitattributes
!.gitignore
!.gitkeep
!.travis.yml
!src/collective

*.map

# dirs
share/
.idea/
# Node & Grunt

Gruntfile.js
node_modules/
package.json
temp_resources
50 changes: 0 additions & 50 deletions .gitlab-ci.yml

This file was deleted.

10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist: trusty
language: python
sudo: false
cache:
Expand All @@ -6,7 +7,7 @@ cache:
- eggs
- downloads
python:
- "2.7"
- '2.7'
matrix:
fast_finish: true
install:
Expand All @@ -15,9 +16,10 @@ install:
- bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
- bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- firefox -v
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3 # give xvfb some time to start
- firefox -v
script:
- bin/code-analysis
- bin/test
Expand Down
6 changes: 4 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ Changelog
=========


1.0a1 (unreleased)
------------------
1.0.0a1 (unreleased)
--------------------

Added:

- Initial release.
[sarn0ld]
2 changes: 2 additions & 0 deletions CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Contributors
============

- Stefan Antonelli, stefan.antonelli@operun.de
- Jesse Stippel, jesse.stippel@operun.de
- Stefan Arnold, stefan.arnold@operun.de
33 changes: 13 additions & 20 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,32 @@
If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
This text does not appear on pypi or github. It is a comment.
====================
collective.frontpage
====================

Tell me what your product does
.. image:: https://travis-ci.org/collective/collective.frontpage.svg?branch=master
:target: https://travis-ci.org/collective/collective.frontpage

Features
--------
.. image:: https://coveralls.io/repos/github/collective/collective.frontpage/badge.svg?branch=master
:target: https://coveralls.io/github/collective/collective.frontpage?branch=master

- Can be bullet points

==================
collective.frontpage
==================

Examples
--------

This add-on can be seen in action at the following sites:
- Is there a page on the internet where everybody can see the features?
A customizable frontpage package for Plone.


Documentation
-------------

Full documentation for end users can be found in the "docs" folder, and is also available online at http://docs.plone.org/foo/bar
Full documentation for end users can be found in the "docs" folder.


Translations
------------

This product has been translated into
This product has been translated into:

- Klingon (thanks, K'Plai)
- German (thanks, santonelli)


Installation
Expand All @@ -48,22 +43,20 @@ Install collective.frontpage by adding it to your buildout::
collective.frontpage


and then running ``bin/buildout``
and then running ``bin/buildout``...


Contribute
----------

- Issue Tracker: https://github.com/collective/collective.frontpage/issues
- Source Code: https://github.com/collective/collective.frontpage
- Documentation: https://docs.plone.org/foo/bar


Support
-------

If you are having issues, please let us know.
We have a mailing list located at: project@example.com
If you are having issues, please let us know. We have a issue tracker located at: https://github.com/collective/collective.frontpage/issues


License
Expand Down
4 changes: 0 additions & 4 deletions bobtemplate.cfg

This file was deleted.

0 comments on commit 3a513d1

Please sign in to comment.