Commit 86bd0244 authored by Levi's avatar Levi

Merge branch 'develop'

parents 4c3b9a58 1470caee
db.sqlite3
*.pyc
*.DS_Store
build/
dist/
*.egg_info
#editors && utilites.
*.swp
......@@ -11,7 +11,7 @@ __pycache__/
#django
local_settings.py
media/*
media/
!media/keep
/CACHE/
/static/
......@@ -29,6 +29,8 @@ ungleich.db
secret-key
*.psd
.idea/
.env
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/>`_
*merging your branch*
(**IMPORTANT**)
Before You make a pull request from Your forked branch to the ungleich make sure You did merge and resolve any conflicts You may find and that the application is running bug free.
Also You can run
``./manage test``
To merge upstream branch run this git commands.
``git fetch upstream``
``git checkout your_feature_branch``
``git merge remotes/upstream/develop``
......@@ -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">
......@@ -8,4 +8,4 @@
<li>{{ message.received_date }}
</ul>
<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>
<p><a href="{% url 'digitalglarus:home' %}">Back to Main</a>
{% extends "base_glarus.html" %}
{% load staticfiles cms_tags %}
{% block content %}
<div class="row">
<div class="box">
{% placeholder 'digitalglarus_gallery' %}
<div class="col-lg-12 text-center">
<h2 class="brand-before">
<small>WELCOME TO</small>
</h2>
<h1 class="brand-name">Digital Glarus</h1>
<hr class="tagline-divider">
<h2>
<small>By
<strong><a href="http://ungleich.ch">ungleich gmbh</a></strong>
</small>
</h2>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_build_a_tech_valley' %}
</h2>
<hr>
<img class="img-responsive img-border img-left" src="{% static 'digitalglarus/img/intro-pic.jpg' %}" alt="">
<hr class="visible-xs">
{% placeholder 'digital_glarus_build_a_tech_valley_content' %}
<p>&nbsp;</p>
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_a_new_area' %}
</h2>
<hr>
{% placeholder 'digital_glarus_a_new_area_content' %}
</div>
</div>
</div>
<div class="row">
<div class="box">
<div class="col-lg-12">
<hr>
<h2 class="intro-text text-center">
{% placeholder 'digital_glarus_why_be_interested' %}
</h2>
<hr>
{% placeholder 'digital_glarus_why_be_interested_content' %}
</div>
</div>