Commit graph

1174 commits

Author SHA1 Message Date
Tomislav R
6abf5b1b53 Updated INSTALLATION doc 2016-05-04 20:13:31 +02:00
Tomislav R
5480b51e92 Updated INSTALLATION doc 2016-05-04 20:13:31 +02:00
Tomislav R
7faf08bfde Updated INSTALLATION doc 2016-05-04 20:12:58 +02:00
Tomislav R
9cfdeb73c6 Updated INSTALLATION doc 2016-05-04 20:12:58 +02:00
Tomislav R
d7b31c443a Updated INSTALLATION doc 2016-05-04 20:11:15 +02:00
Tomislav R
f536da4e01 Updated INSTALLATION doc 2016-05-04 20:11:15 +02:00
Tom
a14135adff payment bug resolve 2016-05-04 17:59:25 +00:00
Tom
f1716410e6 payment bug resolve 2016-05-04 17:59:25 +00:00
Tom
358bacff85 remove debugger 2016-05-04 17:45:41 +00:00
Tom
9f859ef116 remove debugger 2016-05-04 17:45:41 +00:00
Tom
41bcdc92d0 remove debugger 2016-05-04 17:45:12 +00:00
Tom
786dbbf895 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
tmslav
4c68bd8dbc 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
Tomislav R
9f2b3a2a31 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
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
539117741e Changed redirect url after login 2016-05-03 01:06:43 -05:00
Levi
bbddb48ecc 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
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
b19e33b8da added test 2016-05-02 02:00:38 +02:00
Tomislav R
3b387d61db added test 2016-05-02 02:00:38 +02:00
Tomislav R
65e3cdeb94 update dg payment 2016-05-01 14:13:12 +02:00
Tomislav R
45730e4eb1 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 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
3a12308e85 Fixed error creating stripe customer 2016-04-30 14:29:16 -05:00
Levi
c4bf4fc6ff 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 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
1c5fc6a437 Added redirect urls after signup/login 2016-04-30 13:55:55 -05:00
Levi
4d47564ea6 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 Velázquez
b06b0f9ebb 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
8f82a5b88e 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 Velázquez
90833d5a19 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
46893a5f60 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
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
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 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
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
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
69f9f4a416 fix merge conflict 2016-04-28 19:47:44 +02:00
Tomislav R
e0fc542673 fix merge conflict 2016-04-28 19:47:44 +02:00