sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1838 commits 10 branches 82 tags 313 MiB
Commit graph

342 commits

Author SHA1 Message Date
Tomislav R
f6fbf13023 https://redmine.ungleich.ch/issues/2290 2016-05-21 00:03:17 +02:00
Levi
88ee543083 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-05-20 16:43:17 -04:30
Levi
5bdcc5d2b2 Fixed Login Error Style , Started view to generating SSH key for a VM 2016-05-20 16:41:42 -04:30
Tom
418c257978 delete orders 2016-05-20 15:00:06 +00:00
Tomislav R
2a7603778a resolve conflicts 2016-05-20 14:22:51 +02:00
Levi
e26eecf2eb Changed offers in VM pricing, Fixed pricing error changing disk size, VM footer dead links, Added logged out message 2016-05-19 01:47:16 -04:30
Tomislav R
04d8c263bf add delete hosting order 2016-05-19 00:58:28 +02:00
Levi
c869f4ec0b removed RailsBetaUser 2016-05-14 02:20:45 -04:30
Levi
994b489c63 Added test to order detail view, Added test to customer orders view, Added test to virtual machine detail view, Added test to customer booked virtual machines view 2016-05-14 02:12:42 -04:30
Levi
2a1bcbc904 added model mommy to requirements.txt 2016-05-12 02:11:18 -05:00
Levi
bf17e80df4 Added based view test, Added billing address form test, payment view test , Added test for hetzner pricing calculation, Added test for bern pricing calculation, Fixed script to load initial pricing data 2016-05-12 01:57:34 -05:00
Levi
14f78893d5 Added DjangoHostingView test, Added RailsHostingView test, Added, NodeJSHostingView test, Changed VMPlan model, Fixed templates to support new relationship between orders and VMplans, Merged Calendar feature with Booking 2016-05-05 01:03:35 -05:00
Levi
bf0e152789 Merge branch 'develop' into feature/vm_pricing 2016-05-04 22:07:30 -05:00
Levi
90aca7c25c Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Tomislav R
52ea4eec49 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Levi
a99ea335c8 Added VM detail page, Added VM setting page, Added VM pricing page,Added VM orders page, Added VM status page 2016-05-04 00:16:41 -05:00
Levi
539117741e Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi
906df2a111 Added pagination to orders view, Created, Virtual machines booked page ,Changed logged user nabber , Added pagination to virtual machines view , Started Virtual machine detail page 2016-05-03 00:59:40 -05:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Levi
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
de48f1ce69 Fixes digitalglarus urls, Added translated text to ungleich landing page, Create user’s order template, Created view to list all user’s orders, Adding some style to pricing template 2016-04-29 01:53:24 -05: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
46ab364184 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -05: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
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
Levi
9fa83e6f9a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-22 19:58:30 -05:00
Levi
38801abed7 Added View to render payment page, Added Payment and summary forms, Added Payment.js library to request stripe token , Added jQuery validator for handling payment form errors 2016-04-22 08:36:38 -05:00
Tomislav R
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
Levi
9694681dd2 Added serializer to VM model, Rewrite django hosting view , Created price selection templates , Added price selector with automatic price change 2016-04-19 01:04:42 -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
5e1419cd1c registered VM types model in the admin 2016-04-17 20:05:39 -05:00
Levi
7c891fe9c4 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
Tomislav R
baef7e4aa8 fixed requirements 2016-03-16 00:26:49 +01:00
rscnt
decfaa676e dynamic year for hosting template footer 
Signed-off-by: rscnt <rascnt@gmail.com>
 2016-02-03 05:24:58 -06:00
rscnt
fd1b987bb6 hosting: fixed views function calls 2015-09-22 05:37:22 -06:00
Nico Schottelius
16008512b2 Merge branch 'feature/notifybymail' into develop 2015-09-03 19:56:39 +02:00
Nico Schottelius
a69ac73f5d Add cards 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-09-03 19:56:31 +02:00
Nico Schottelius
42b0acd45e merge railshosting into hosting 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:33:10 +02:00
Nico Schottelius
59ef61dfe8 merge from sanghee 
Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org>
 2015-08-27 18:21:15 +02: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