diff --git a/INSTALLATION.rst b/INSTALLATION.rst new file mode 100644 index 00000000..26a4ae0e --- /dev/null +++ b/INSTALLATION.rst @@ -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 `_ and `Ungleich blog `_. + +If You are starting to create a new feature fork the github `repo `_ 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 `_ + + + + + diff --git a/README.rst b/README.rst index e7ec582d..8c8c8ddb 100644 --- a/README.rst +++ b/README.rst @@ -13,10 +13,4 @@ Website for ungleich GmbH - /hosting/rubyonrails/ - /hosting/nodejs/ -- - - feedback app - - below ungleich? - - no - - redirect back to // render other url? - - /feedback -