dynamicweb

Go to file

rascencio 4389230b60 :Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop Conflicts: dynamicweb/settings-test/__init__.py requirements.txt templates/cms/ungleich.ch/_footer.html templates/cms/ungleich.ch/_header_base.html templates/cms/ungleich.ch/_menu.html templates/cms/ungleich.ch/base.html templates/cms/ungleich.ch/blog.html templates/cms/ungleich.ch/page.html templates/cms/ungleichch/__init__.py templates/cms/ungleichch/_footer.html templates/cms/ungleichch/_header_base.html templates/cms/ungleichch/_menu.html templates/cms/ungleichch/base.html templates/cms/ungleichch/blog.html templates/cms/ungleichch/page.html ungleich/templates/cms/ungleichch/_footer.html ungleich/templates/cms/ungleichch/_header_base.html ungleich/templates/cms/ungleichch/_menu.html ungleich/templates/cms/ungleichch/base_ungleich.html ungleich/templates/cms/ungleichch/blog_ungleich.html ungleich/templates/cms/ungleichch/page.html		2016-04-22 10:08:33 +02:00
cms_templates	fixing url translations	2016-04-15 22:25:57 -05:00
configs	configs: circus example to match with staging.	2015-06-09 02:26:56 -06:00
design_membership	error button added	2016-03-02 20:06:31 +01:00
digitalglarus	Fixed ungleich urls, created model for storing VM types, created command to load VM prices and data to database	2016-04-17 19:52:19 -05:00
docs	docs: added requirements	2015-06-15 00:20:55 -06:00
dynamicweb	:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop	2016-04-22 10:08:33 +02:00
hosting	wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop	2016-04-22 10:04:00 +02:00
media	added media	2016-03-25 19:39:50 +01:00
membership	updated main pages links	2016-04-01 12:37:01 +02:00
railshosting/static/railshosting/img	Merge branch 'develop' of git-ungleich:dynamicweb into develop	2015-09-15 11:16:02 -06:00
templates	:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop	2016-04-22 10:08:33 +02:00
ungleich	Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms .	2016-04-10 16:12:43 -05:00
ungleich_page	fixing url translations	2016-04-15 22:25:57 -05:00
utils	Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms .	2016-04-10 16:12:43 -05:00
.gitignore	Adding .psd to gitignore	2016-04-13 00:50:11 -05:00
.python-version	added python version	2015-10-07 20:27:34 -06:00
DEPLOY.rst	Merge remote-tracking branch 'refs/remotes/origin/master'	2016-03-05 19:57:41 +00:00
INSTALLATION.rst	Update INSTALLATION.rst	2016-04-10 04:20:15 +02:00
Makefile	.	2015-06-13 22:12:00 -06:00
README.rst	doc	2016-04-10 03:42:26 +02:00
manage.py	changes on prod - master	2016-03-05 19:46:46 +00:00
opens	changes on prod - master	2016-03-05 19:46:46 +00:00
pg_upgrade_internal.log	Merge remote-tracking branch 'refs/remotes/origin/master'	2016-03-05 19:57:41 +00:00
pg_upgrade_server.log	Merge remote-tracking branch 'refs/remotes/origin/master'	2016-03-05 19:57:41 +00:00
pg_upgrade_utility.log	Merge remote-tracking branch 'refs/remotes/origin/master'	2016-03-05 19:57:41 +00:00
requirements.debian.txt	changes on prod - master	2016-03-05 19:46:46 +00:00
requirements.debian.txt.bak	changes on prod - master	2016-03-05 19:46:46 +00:00
requirements.txt	:Merge remote-tracking branch 'remotes/origin/feature/digital.glarus.german' into develop	2016-04-22 10:08:33 +02:00
requirements.txt.orig	production changes	2016-04-10 01:05:33 +00:00
requirements_old.txt	fixed requirements	2016-03-16 00:26:49 +01:00
uwsgi.ini	changes on prod - master	2016-03-05 19:46:46 +00:00

README.rst

ungleich
========

dynamicweb
----------
Website for ungleich GmbH
=======

- djangocms
    - forms!
    - hosting urls
        - /hosting/django/
        - /hosting/rubyonrails/
        - /hosting/nodejs/
        --