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

2,793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom
a14135adff payment bug resolve 2016-05-04 17:59:25 +00:00
Tom
358bacff85 remove debugger 2016-05-04 17:45:41 +00:00
Tom
41bcdc92d0 remove debugger 2016-05-04 17:45:12 +00:00
tmslav
e33df5173d Merge pull request #59 from tmslav/develop 
Develop
 2016-05-04 17:42:36 +02: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
b19e33b8da added test 2016-05-02 02:00:38 +02:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Levi Velázquez
3b3a366c23 Merge pull request #55 from levivm/feature/vm_pricing 
Fixed error creating stripe customer
 2016-04-30 14:30:54 -05:00
Levi
3a12308e85 Fixed error creating stripe customer 2016-04-30 14:29:16 -05:00
Levi Velázquez
03ec41b8e2 Merge pull request #54 from levivm/feature/vm_pricing 
Added redirect urls after signup/login
 2016-04-30 13:57:11 -05:00
Levi
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi Velázquez
61442e6f02 Merge pull request #53 from levivm/feature/vm_pricing 
Fixed requirements file
 2016-04-29 23:54:45 -05:00
Levi
57b1ab7022 Fixed requirements file 2016-04-29 23:53:36 -05:00
Levi Velázquez
7c8093734b Merge pull request #52 from levivm/feature/vm_pricing 
Fixed requirements file
 2016-04-29 23:44:15 -05:00
Levi
bad0bd60d0 Fixed requirements file 2016-04-29 23:43:34 -05:00
Levi Velázquez
4d4c7cf84e Merge pull request #51 from levivm/feature/vm_pricing 
Fixes digitalglarus urls, Added translated text to ungleich landing, Created Order view
 2016-04-29 01:58:42 -05:00
Levi Velázquez
484c80d15a Merge pull request #50 from levivm/feature/vm_pricing 
Handled stripe payment errors , Added payment invoice
 2016-04-29 01:53: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 Velázquez
df886a756c Merge pull request #49 from levivm/feature/vm_pricing 
Stripe integration
 2016-04-27 01:53:38 -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
f5978a7da9 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi
39d262bc24 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 19:19:47 -05:00
Levi
34fcb403c7 Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Levi
98c1740cd2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 16:16:39 -05:00
Tomislav R
2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
tmslav
f01390ec17 Merge pull request #48 from tmslav/develop 
url structure fix ungleich
 2016-04-24 01:16:38 +02:00
Tomislav R
c57db296aa url structure fix ungleich 2016-04-24 01:15:58 +02:00
tmslav
0b498dec32 Merge pull request #47 from tmslav/develop 
added dist
 2016-04-23 23:48:38 +02:00
Tomislav R
74ca696bfc added dist 2016-04-23 23:48:03 +02:00
tmslav
12b00348d1 Merge pull request #46 from tmslav/develop 
change remove files loading
 2016-04-23 23:38:54 +02:00
Tomislav R
27d4a43e12 change remove files loading 2016-04-23 23:38:09 +02:00
tmslav
f29e15375d Merge pull request #45 from tmslav/develop 
font-awesome local version
 2016-04-23 20:40:02 +02:00
Tomislav R
849d5e313d font-awesome local version 2016-04-23 20:39:02 +02:00
tmslav
5544c40337 Merge pull request #44 from tmslav/develop 
https
 2016-04-23 20:27:55 +02:00
Tomislav R
9215655d6c https 2016-04-23 20:27:13 +02:00
tmslav
17788cafb9 Merge pull request #43 from tmslav/develop 
new url structure
 2016-04-23 20:13:34 +02:00
Tomislav R
b72a2795f0 new url structure 2016-04-23 20:12:55 +02:00
Tomislav R
49f50117d8 Merge branch 'tmslav-updating_calendar' into develop 2016-04-23 19:09:59 +02:00
Tomislav R
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
tmslav
81281e9cd7 Merge pull request #41 from levivm/feature/vm_pricing 
Billing Address Form added, Fixes on login / signup, Stripe test.
 2016-04-23 19:01:16 +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
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