Commit graph

705 commits

Author SHA1 Message Date
Tomislav R
949d2a3e58 fix contact ungleich 2016-05-08 19:58:37 +02:00
Tom
43da718153 ungleich template - fix unused translatation tag 2016-05-08 15:01:59 +00:00
tmslav
f64c42e554 Merge pull request #62 from tmslav/develop
Develop
2016-05-07 23:07:22 +02:00
Tomislav R
e137e8a26e resolve base.py conflict 2016-05-07 23:05:46 +02:00
Tomislav R
073c9bf192 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-07 23:02:49 +02:00
Levi Velázquez
3cad994970 Merge pull request #61 from levivm/develop
Develop
2016-05-05 09:03:44 -05:00
Levi
9415041f64 Merge branch 'feature/vm_pricing' into develop 2016-05-05 01:04:02 -05:00
Levi
342512036d 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
ca136d4e47 Merge branch 'develop' into feature/vm_pricing 2016-05-04 22:07:30 -05:00
Levi
6e8004bfd0 Changed hostingorder to m2m with vm plan model 2016-05-04 22:06:49 -05:00
Tomislav R
5480b51e92 Updated INSTALLATION doc 2016-05-04 20:13:31 +02:00
Tomislav R
9cfdeb73c6 Updated INSTALLATION doc 2016-05-04 20:12:58 +02:00
Tomislav R
f536da4e01 Updated INSTALLATION doc 2016-05-04 20:11:15 +02:00
Tom
f1716410e6 payment bug resolve 2016-05-04 17:59:25 +00:00
Tom
9f859ef116 remove debugger 2016-05-04 17:45:41 +00:00
Tom
786dbbf895 remove debugger 2016-05-04 17:45:12 +00:00
tmslav
4c68bd8dbc Merge pull request #59 from tmslav/develop
Develop
2016-05-04 17:42:36 +02:00
Tomislav R
9f2b3a2a31 resolve merge conflicts 2016-05-04 17:36:54 +02:00
Levi
1486843af0 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
bbddb48ecc Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi
7d697b3c3a 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
3b387d61db added test 2016-05-02 02:00:38 +02:00
Tomislav R
45730e4eb1 update dg payment 2016-05-01 14:13:12 +02:00
Levi Velázquez
8a6c05eb7d Merge pull request #55 from levivm/feature/vm_pricing
Fixed error creating stripe customer
2016-04-30 14:30:54 -05:00
Levi
c4bf4fc6ff 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
4d47564ea6 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
8f82a5b88e 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
46893a5f60 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
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
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
Tomislav R
e0fc542673 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
0fc96880ef 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 Velázquez
a5c24855a4 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
981be2dcf4 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
84e5178e9b 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
Tomislav R
fcc1f8fb4b 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
Tomislav R
07a6473f62 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
Tomislav R
84ce57b2c2 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
Tomislav R
2f7b9e4ad4 change remove files loading 2016-04-23 23:38:09 +02:00