From 45af2dbc05c9ad3cc9c8fd82e1f9ac466dbf111c Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Sun, 10 Apr 2016 03:42:26 +0200 Subject: [PATCH 1/3] doc --- INSTALLATION.rst | 30 ++++++++++++++++++++++++++++++ README.rst | 6 ------ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 INSTALLATION.rst diff --git a/INSTALLATION.rst b/INSTALLATION.rst new file mode 100644 index 00000000..b88bf7fa --- /dev/null +++ b/INSTALLATION.rst @@ -0,0 +1,30 @@ +ungleich +======== + +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 + + +Development +=========== +Project is separated in master branch and development branch. +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/). + + 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 -
From 1ebaaef8c3bd510796c0614a06c7d63ea0a6cf02 Mon Sep 17 00:00:00 2001 From: tmslav Date: Sun, 10 Apr 2016 03:47:17 +0200 Subject: [PATCH 2/3] Update INSTALLATION.rst --- INSTALLATION.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALLATION.rst b/INSTALLATION.rst index b88bf7fa..00b8f3ba 100644 --- a/INSTALLATION.rst +++ b/INSTALLATION.rst @@ -13,18 +13,18 @@ Requirements Install ======= -The quick way:: - pip install -r requirements.txt +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 + `psql -d app < dump.db` Development =========== Project is separated in master branch and development branch. -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/). +Master branch is currently used on `Digital Glarus` and [Ungleich blog](https://digitalglarus.ungleich.ch/en-us/blog/). From c7500175e9a24aba496adb9b7cac33ab12ef1b84 Mon Sep 17 00:00:00 2001 From: tmslav Date: Sun, 10 Apr 2016 04:20:15 +0200 Subject: [PATCH 3/3] Update INSTALLATION.rst --- INSTALLATION.rst | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/INSTALLATION.rst b/INSTALLATION.rst index 00b8f3ba..26a4ae0e 100644 --- a/INSTALLATION.rst +++ b/INSTALLATION.rst @@ -1,7 +1,4 @@ -ungleich -======== - -dynamicweb +Dynamicweb ---------- Installation for dynamicweb ======= @@ -14,17 +11,39 @@ Requirements Install ======= The quick way: - `pip install -r requirements.txt` + ``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` - + ``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. -Master branch is currently used on `Digital Glarus` and [Ungleich blog](https://digitalglarus.ungleich.ch/en-us/blog/). +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 `_ + + +