Merge pull request #23 from tmslav/develop

Develop
This commit is contained in:
tmslav 2016-04-10 04:43:19 +02:00
commit a61f4f8318
2 changed files with 49 additions and 6 deletions

49
INSTALLATION.rst Normal file
View file

@ -0,0 +1,49 @@
Dynamicweb
----------
Installation for dynamicweb
=======
Requirements
============
* Python 3.5+
Install
=======
The quick way:
``pip install -r requirements.txt``
Next find the dump.db file on stagging server. Path for the file is under the base application folder.
Install the postgresql server and import the database::
``psql -d app < dump.db``
**No migration is needed after a clean install, and You are ready to start developing.**
Development
===========
Project is separated in master branch and development branch, and feature branches.
Master branch is currently used on `Digital Glarus <https://digitalglarus.ungleich.ch/en-us/digitalglarus/>`_ and `Ungleich blog <https://digitalglarus.ungleich.ch/en-us/blog/>`_.
If You are starting to create a new feature fork the github `repo <https://github.com/ungleich/dynamicweb>`_ and branch the development branch.
After You have complited the task create a pull request and ask someone to review the code from other developers.
**Cheat sheet for branching and forking**:
*branching*
``git branch feature_name && git checkout feature_name``
*fetching upstream(should be done everytime before development is started)*
``git fetch upstream && git merge upstream/feature_name``
`read more about getting code from upstream here <https://help.github.com/articles/syncing-a-fork/>`_

View file

@ -13,10 +13,4 @@ Website for ungleich GmbH
- /hosting/rubyonrails/
- /hosting/nodejs/
--
- feedback app
- below ungleich?
- no
- redirect back to // render other url?
- /feedback
<form action="{% url 'hosting:index' %}" method="post" role="form" class="form-inline">