949d2a3e58
fix contact ungleich
2016-05-08 19:58:37 +02:00
45730e4eb1
update dg payment
2016-05-01 14:13:12 +02:00
e0fc542673
fix merge conflict
2016-04-28 19:47:44 +02:00
0fc96880ef
update dg
2016-04-28 19:42:01 +02:00
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
981be2dcf4
Merge branch 'develop' into feature/vm_pricing
2016-04-24 19:20:17 -05:00
84e5178e9b
Merge branch 'develop' into feature/vm_pricing
2016-04-24 16:18:37 -05:00
fcc1f8fb4b
reverted changes to url structure
2016-04-24 23:16:38 +02:00
07a6473f62
url structure fix ungleich
2016-04-24 01:15:58 +02:00
rascencio
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
213f295394
digitalglarus booking update
2016-04-23 19:00:20 +02:00
4777484245
Created a base template for login / signup, Fixed some html design issues on login / signup pages, Added Billing Address Form to payment page, Handle Billing Address Form validation, Created VirtualMachinePlan model in order to store user purchased VM, Create method in order to create a stripe plan , Investigated about stripe payment workflows
2016-04-23 02:22:44 -05:00
rascencio
4a68857717
wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
...
Conflicts:
dynamicweb/urls.py
2016-04-22 10:04:00 +02:00
64a484e749
Separated base hosting page into html sections, Added pricing selector to Django Page, Added pricing selector to Rails Page, Added pricing selector to NodeJS Page, Implemented hosting signup , Implemented hosting login, Created forms to handle login/signup errors
2016-04-20 01:03:32 -05:00
4442501786
Added extra URLs for the hosting pages:
...
/djangohosting/
/nodehosting/
Also fixed a small typo in hosting/templates/hosting/rails.html
Related tickets:
https://redmine.ungleich.ch/issues/2225
https://redmine.ungleich.ch/issues/1620
https://redmine.ungleich.ch/issues/1621
2016-04-18 12:16:29 +03:00
bdbf328375
fixed login urls
2016-04-15 22:57:16 -05:00
997f3145db
Fixed admin urls
2016-04-13 01:27:11 -05:00
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
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
10d3e236ee
home added and assigned right template
2016-04-09 08:51:20 +02:00
949ee20a8a
updated ungleich
2016-04-03 11:46:25 +02:00
6319515bb4
fixed new user registration
2016-03-16 15:10:48 +01:00
3157db235a
test
2016-03-07 17:49:02 +01:00
abbc2982e3
django version update #3
2016-02-29 23:28:31 +01:00
rascencio
f5ca1934c0
dynamicweb/urls: removing static() call
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
rascencio
ca3031dde2
dynamicweb/urls: fetch project settings instead of project settings module
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 14:45:04 -06:00
rascencio
a4c3c341a3
digitalglarus: changes on urls
2015-10-04 16:48:33 -06:00
rascencio
1b17e2aac1
digitalglarus: fix urls for blog.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:38:53 -06:00
rascencio
0827c6f2ff
digitalglarus: moving digital glarus static url.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:20:39 -06:00
rascencio
9d38d3aee6
digitalglarus: i18n django-cms conf
2015-10-04 09:38:01 -06:00
rascencio
0a83b1494d
dynamicweb: hotfix railshosting
2015-09-22 05:28:34 -06:00
rascencio
e91b87a889
urls: removed railshosting
2015-09-15 14:46:19 -06:00
rascencio
81207b8e12
Merge branch 'develop' of git-ungleich:dynamicweb into develop
2015-09-15 11:16:02 -06:00
rascencio
1338b94e07
project: urls, added i18n routes
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-15 08:57:56 -06:00
2bf346495e
begin refactor to /hosting/
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:20:08 +02:00
b619a2b57a
mount djangocms on / again - found working nginx config
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 21:45:33 +02:00
640f99bbed
mount djangocms on / again - found working nginx config
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-12 21:45:33 +02:00
cd234c4dda
digital_glarus -> digitalglarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
da0ece6d63
digital_glarus -> digitalglarus
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00
a26a2ec105
mount cms below cms - easier for nginx mapping
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 21:16:08 +02:00
46ce08909d
mount cms below cms - easier for nginx mapping
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 21:16:08 +02:00
rascencio
5829c9fa4a
Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
...
Conflicts:
dynamicweb/settings.py
Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
Added railshosting url.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:29:33 -06:00
rascencio
5d9c306573
Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
...
Conflicts:
dynamicweb/settings.py
Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
Added railshosting url.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-30 15:29:33 -06:00
023dad86df
get railshosting running
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:41:43 +02:00
6aaa04eaa2
get railshosting running
...
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-05-27 15:41:43 +02:00
rascencio
76bfb3c47b
Added ungleich app to extend Page models.
...
Ungleich app has a model called UngleichPage,
this model has an attribute called image_header
which will be used to set the background image for
the page header.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 00:33:35 -06:00
rascencio
bad0870035
Added ungleich app to extend Page models.
...
Ungleich app has a model called UngleichPage,
this model has an attribute called image_header
which will be used to set the background image for
the page header.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-23 00:33:35 -06:00
rascencio
0af909af0e
urls: added taggit_autosuggest.url, djangocms-blog
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:29:42 -06:00
rascencio
7aa821fdfd
urls: added taggit_autosuggest.url, djangocms-blog
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:29:42 -06:00
rascencio
40ca3f37a0
urls: imports, forgot, dumb.
...
Signed-off-by: rscnt <rascnt@gmail.com>
2015-05-21 01:21:22 -06:00
Tomislav R
Levi
rascencio
Efstratios Goudelis
Nico Schottelius