amal
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,174 Commits 8 Branches 146 Tags 314 MiB
Commit Graph

1174 Commits

Author SHA1 Message Date
Tomislav R a493ad225d update dg 2016-04-28 19:42:01 +02:00
Tomislav R 0fc96880ef 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 e7c8258427 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 Velázquez a5c24855a4 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 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 f5978a7da9 Merge branch 'develop' into feature/vm_pricing 2016-04-24 19:20:17 -05:00
Levi 981be2dcf4 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 f1dfc205ac 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 84e5178e9b 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
Levi b770a9b2cc 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
Tomislav R fcc1f8fb4b 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
tmslav 7ac715684e 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
Tomislav R 07a6473f62 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
tmslav 3f4d29c38f 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
Tomislav R 84ce57b2c2 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
tmslav 2d74d06691 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
Tomislav R 2f7b9e4ad4 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
tmslav 4c7c3c5141 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
Tomislav R 8ea8ff216c 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
tmslav f1da9bd24b 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
Tomislav R 8bf18c2833 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
tmslav 0150801e93 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 5d0b49b6d9 new url structure 2016-04-23 20:12:55 +02:00
rascencio 49f50117d8 Merge branch 'tmslav-updating_calendar' into develop 2016-04-23 19:09:59 +02:00
rascencio a6256964e8 Merge branch 'tmslav-updating_calendar' into develop 2016-04-23 19:09:59 +02:00
rascencio 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
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
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
tmslav 9057b3ac7e 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
Tomislav R 213f295394 digitalglarus booking update 2016-04-23 19:00:20 +02:00