Commit graph

68 commits

Author SHA1 Message Date
PCoder
1a7cefcc54 Merged pcoder/set_debug_false into pcoder-set_debug_false 2017-07-07 04:47:15 +05:30
M.Ravi
3304d862cb Moved static images urlpattern out of DEBUG case 2017-07-05 00:07:06 +02:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
M.Ravi
dec1ccd180 Created url for buy button on datacenterlight home page and redirection
of ^hosting/ endpoint to take to hosting app's login page.
2017-05-14 12:44:11 +02:00
Modulos
b7e8eceb25 Add opennebula api urls and add delete vm api 2017-05-11 17:39:59 +02:00
M.Ravi
d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
Levi
abfab6915c added datacenterlight 2016-12-20 18:05:20 -05:00
Levi
dca2250378 fixed history.html , contact us section added again history.html, supporter list style added, changed digitalglarus login, Fixed digitalglarus login form when user sent nothing,Fixed digitalglarus signup form , Fixed relaway font bug 2016-08-15 23:56:14 -05:00
Levi
cb520f6b58 Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app. 2016-07-22 01:24:32 -05:00
Levi
da9169c4ce Added login.html, Added login view , Added login form,Created Donation Django Model 2016-07-19 01:07:49 -05:00
Levi
e90c5fece0 Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs 2016-06-30 01:23:14 -05:00
Levi
6d029fdeb5 Added cron to send email and fixing settings error 2016-06-16 01:04:48 -05:00
Tomislav R
05e752625e fix contact ungleich 2016-05-08 19:58:37 +02:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Tomislav R
69f9f4a416 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
a493ad225d update dg 2016-04-28 19:42:01 +02:00
Levi
bf334a38d4 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
Levi
f5978a7da9 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi
34fcb403c7 Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Tomislav R
2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R
c57db296aa url structure fix ungleich 2016-04-24 01:15:58 +02:00
c653917358 :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
ae0c404951 digitalglarus booking update 2016-04-23 19:00:20 +02:00
Levi
5456c4c341 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
f4fb538b9e wqMerge remote-tracking branch 'remotes/origin/feature/vm_pricing' into develop
Conflicts:
	dynamicweb/urls.py
2016-04-22 10:04:00 +02:00
Levi
4e23adcea6 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
Efstratios Goudelis
805707e905 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
Levi
5397fd9a63 fixed login urls 2016-04-15 22:57:16 -05:00
Levi
488bb76c76 Fixed admin urls 2016-04-13 01:27:11 -05:00
Levi
c09fc89197 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
7dd4f7e70a 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
Tomislav R
36b99b93ef home added and assigned right template 2016-04-09 08:51:20 +02:00
Tomislav R
24badb1a9c updated ungleich 2016-04-03 11:46:25 +02:00
Tomislav R
0a7dd2fa3d fixed new user registration 2016-03-16 15:10:48 +01:00
Tomislav R
e7f11e9556 test 2016-03-07 17:49:02 +01:00
Tomislav R
0558d6e396 django version update #3 2016-02-29 23:28:31 +01:00
d55a02c015 dynamicweb/urls: removing static() call
Signed-off-by: rscnt <rascnt@gmail.com>
2015-11-02 16:02:39 -06:00
bec5a7319d 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
a4c3c341a3 digitalglarus: changes on urls 2015-10-04 16:48:33 -06:00
1b17e2aac1 digitalglarus: fix urls for blog.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:38:53 -06:00
0827c6f2ff digitalglarus: moving digital glarus static url.
Signed-off-by: rscnt <rascnt@gmail.com>
2015-10-04 15:20:39 -06:00
9d38d3aee6 digitalglarus: i18n django-cms conf 2015-10-04 09:38:01 -06:00
0a83b1494d dynamicweb: hotfix railshosting 2015-09-22 05:28:34 -06:00
e91b87a889 urls: removed railshosting 2015-09-15 14:46:19 -06:00
81207b8e12 Merge branch 'develop' of git-ungleich:dynamicweb into develop 2015-09-15 11:16:02 -06:00
1338b94e07 project: urls, added i18n routes
Signed-off-by: rscnt <rascnt@gmail.com>
2015-09-15 08:57:56 -06:00
Nico Schottelius
2bf346495e begin refactor to /hosting/
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-08-27 18:20:08 +02:00
Nico Schottelius
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
Nico Schottelius
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
Nico Schottelius
cd234c4dda digital_glarus -> digitalglarus
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
2015-06-10 23:34:33 +02:00