amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1146 commits 8 branches 146 tags 314 MiB
Commit graph

1146 commits

This branch
This branch
All branches
Author SHA1 Message Date
Levi
c4bf4fc6ff Fixed error creating stripe customer 2016-04-30 14:29:16 -05:00
Levi
3a12308e85 Fixed error creating stripe customer 2016-04-30 14:29:16 -05:00
Levi Velázquez
9db711d686 Merge pull request #54 from levivm/feature/vm_pricing 
Added redirect urls after signup/login
 2016-04-30 13:57:11 -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
4d47564ea6 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi Velázquez
b06b0f9ebb Merge pull request #53 from levivm/feature/vm_pricing 
Fixed requirements file
 2016-04-29 23:54:45 -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
8f82a5b88e Fixed requirements file 2016-04-29 23:53:36 -05:00
Levi
57b1ab7022 Fixed requirements file 2016-04-29 23:53:36 -05:00
Levi Velázquez
90833d5a19 Merge pull request #52 from levivm/feature/vm_pricing 
Fixed requirements file
 2016-04-29 23:44:15 -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
46893a5f60 Fixed requirements file 2016-04-29 23:43:34 -05:00
Levi
bad0bd60d0 Fixed requirements file 2016-04-29 23:43:34 -05:00
Levi Velázquez
fa29204a1a 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
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
9502580030 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 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
3459dc6cbc 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
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
e0fc542673 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
69f9f4a416 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
0fc96880ef update dg 2016-04-28 19:42:01 +02:00
Tomislav R
a493ad225d update dg 2016-04-28 19:42:01 +02:00
Levi
e7c8258427 Handled stripe payment errors , Added invoice template, Added view to handle invoice data 2016-04-27 01:54:15 -05: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
a5c24855a4 Merge pull request #49 from levivm/feature/vm_pricing 
Stripe integration
 2016-04-27 01:53:38 -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
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
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
981be2dcf4 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi
f5978a7da9 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi
f1dfc205ac Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 19:19:47 -05:00
Levi
39d262bc24 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 19:19:47 -05:00
Levi
84e5178e9b Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Levi
34fcb403c7 Merge branch 'develop' into feature/vm_pricing 2016-04-24 16:18:37 -05:00
Levi
b770a9b2cc Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 16:16:39 -05:00
Levi
98c1740cd2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-24 16:16:39 -05:00
Tomislav R
fcc1f8fb4b reverted changes to url structure 2016-04-24 23:16:38 +02:00
Tomislav R
2dff11d446 reverted changes to url structure 2016-04-24 23:16:38 +02:00
tmslav
7ac715684e Merge pull request #48 from tmslav/develop 
url structure fix ungleich
 2016-04-24 01: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
07a6473f62 url structure fix ungleich 2016-04-24 01:15:58 +02:00
Tomislav R
c57db296aa url structure fix ungleich 2016-04-24 01:15:58 +02:00
tmslav
3f4d29c38f Merge pull request #47 from tmslav/develop 
added dist
 2016-04-23 23:48:38 +02:00
tmslav
0b498dec32 Merge pull request #47 from tmslav/develop 
added dist
 2016-04-23 23:48:38 +02:00
Tomislav R
84ce57b2c2 added dist 2016-04-23 23:48:03 +02:00
Tomislav R
74ca696bfc added dist 2016-04-23 23:48:03 +02:00
tmslav
2d74d06691 Merge pull request #46 from tmslav/develop 
change remove files loading
 2016-04-23 23:38:54 +02:00
tmslav
12b00348d1 Merge pull request #46 from tmslav/develop 
change remove files loading
 2016-04-23 23:38:54 +02:00