Commit graph

134 commits

Author SHA1 Message Date
Tomislav R
45730e4eb1 update dg payment 2016-05-01 14:13:12 +02:00
Tomislav R
e0fc542673 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
0fc96880ef update dg 2016-04-28 19:42:01 +02:00
Levi
fdf8722c8f Added Hosting Order model, Created Billing Address Model , Method to create a customer using Stripe API , Created Customer Stripe profile to store for further charges , Method in order to charge an amount to a customer 2016-04-26 01:16:03 -05:00
Tomislav R
fcc1f8fb4b reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R
84ce57b2c2 added dist 2016-04-23 23:48:03 +02:00
Tomislav R
2f7b9e4ad4 change remove files loading 2016-04-23 23:38:09 +02:00
Tomislav R
8ea8ff216c font-awesome local version 2016-04-23 20:39:02 +02:00
Tomislav R
8bf18c2833 https 2016-04-23 20:27:13 +02:00
Tomislav R
5d0b49b6d9 new url structure 2016-04-23 20:12:55 +02:00
f7ec020838 :Merge branch 'updating_calendar' of https://github.com/tmslav/dynamicweb into tmslav-updating_calendar
Conflicts:
	dynamicweb/urls.py
2016-04-23 19:08:23 +02:00
Tomislav R
213f295394 digitalglarus booking update 2016-04-23 19:00:20 +02:00
Levi
05e73b1d5e 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
Levi
5198333013 fixing url translations 2016-04-15 22:25:57 -05:00
Levi
1cfc52cf94 Adding correct home menu option 2016-04-15 21:42:21 -05:00
Levi
ab75b12ffa Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page 2016-04-15 20:18:29 -05:00
Levi
fd66c33299 Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls 2016-04-13 00:31:19 -05:00
Levi
b29ee74634 Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi
20a59f461d Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi
942464f6f6 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
Levi
a575465a80 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
Levi
4beb09dcd1 Added supporters placeholders 2016-04-09 04:03:28 -05:00
Levi
c33b85626a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Levi
0e65c1e717 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Tomislav R
10d3e236ee home added and assigned right template 2016-04-09 08:51:20 +02:00
Levi
50a973c28d changed form email contact 2016-04-08 20:11:29 -05:00
Levi
ebe214d95b Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Tomislav R
031ce0b5f3 Merge remote-tracking branch 'upstream/master' 2016-04-09 01:02:08 +02:00
Tomislav R
1cc0358cb0 added language selection 2016-04-09 01:01:08 +02:00
Levi
a680de0567 cleaning code 2016-04-07 00:30:18 -05:00
Levi
bb8c5314bc Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch 2016-04-07 00:26:50 -05:00
Levi
d7cb1fbbc6 cleaning code 2016-04-03 21:47:21 -05:00
Levi
93e1641203 remove templates 2016-04-03 21:46:17 -05:00
Levi
b2b788d779 template moved 2016-04-03 21:28:04 -05:00
Levi
979a0bb24d Merge branch 'develop' into feature/supporter 2016-04-03 21:15:05 -05:00
Levi
ceeed874d2 fixed supporter page, change footer info, added support-us page, changed contact email 2016-04-03 20:39:57 -05:00
a2a3e6156c blog dg fix 2016-04-04 03:32:22 +02:00
Tomislav R
949ee20a8a updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R
1d18894b60 updated main pages links 2016-04-01 12:37:01 +02:00
Tomislav R
40cdf8a11f removed 2016-03-31 18:15:37 +02:00
Tomislav R
26de99e773 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R
f5ece43b25 added missing blog templates 2016-03-23 14:25:15 +01:00
Tomislav R
6b78bac53b Blog update 2016-03-22 01:21:50 +01:00
0d04a18a0d server push 2016-03-19 21:28:58 +01:00
Tomislav R
ff9a6e1b2b fixed requirements 2016-03-16 00:26:49 +01:00
Tomislav R
3157db235a test 2016-03-07 17:49:02 +01:00
Tomislav R
9eed348b62 Merge branch 'master' into update_django_version 2016-03-03 22:32:36 +01:00
Tomislav R
bfaa88e774 test 2016-03-03 22:22:37 +01:00
상희 김
6cd443c568 color changes 2016-03-01 21:52:04 +01:00
Tomislav R
5fbde4878d update 2016-03-01 21:24:51 +01:00