Commit graph

2208 commits

Author SHA1 Message Date
PCoder
eab0c9fac1 Added price to specs as it is being used in create_vm_task 2017-08-24 12:30:17 +05:30
PCoder
7c3a0b86d8 HostingOrder: Updated set_subscription_id to include cc details as parameter 2017-08-24 11:59:38 +05:30
PCoder
16f000c723 dcl views.py: passing cc details to create_vm_task + reformatted code 2017-08-24 11:54:12 +05:30
PCoder
3111255673 Updated test_create_vm_task for monthly subscriptions 2017-08-24 11:50:43 +05:30
PCoder
0256b0bf03 Added credit card details as param for create_vm_task 2017-08-24 11:49:41 +05:30
PCoder
b5e488e326 Formatted utils/stripe_utils.py 2017-08-24 10:31:57 +05:30
PCoder
a964f2fb5b Merged master into task/3701/enable_monthly_payments 2017-08-24 04:06:48 +05:30
Pcoder
0026874f09 Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages
Corrected/added missing google analytics and reformated code
2017-08-24 00:00:22 +02:00
PCoder
703644ced4 Removed orphaned alt tag 2017-08-24 03:17:39 +05:30
Pcoder
a77b7b0ab5 Merge pull request #460 from pcoder/add_test_create_vm_celery_task
Added test for create vm celery task
2017-08-23 23:24:49 +02:00
PCoder
6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
PCoder
4d18dc6f7c Corrected/added missing google analytics and reformated code 2017-08-24 01:20:32 +05:30
Arvind Tiwari
738e4fc93f removed duplicate for "See Invoice" 2017-08-24 01:07:20 +05:30
Arvind Tiwari
c0ce522dbe Merge pull request #457 from tiwariav/task/3698/my_orders_page
task/3698 my orders page redesigned
2017-08-24 01:02:24 +05:30
Arvind Tiwari
30551e5ac5 merged master 2017-08-24 00:59:17 +05:30
Arvind Tiwari
04d7a2b076 removed fuzzy 2017-08-24 00:48:07 +05:30
Arvind Tiwari
ab4e7feedd Merge pull request #442 from tiwariav/bugfix/3645/modal-show
Bugfix/3645 navbar movement on modal show/hide
2017-08-24 00:34:14 +05:30
Arvind Tiwari
f1f166b798 Ihre virtuelle Maschine beenden -> Deine Virtuelle Maschine beenden 2017-08-24 00:13:03 +05:30
Arvind Tiwari
b2a0e0a385 Merge pull request #453 from tiwariav/task/3697/vm_details_page
Task/3697 vm details page design
2017-08-24 00:01:08 +05:30
Arvind Tiwari
4cf6df64a8 btn link fixed 2017-08-23 23:59:18 +05:30
Arvind Tiwari
17be01370b removed test url 2017-08-23 23:52:09 +05:30
Arvind Tiwari
a2dd55cf16 padding adjusted 2017-08-23 23:49:29 +05:30
M.Ravi
4cc2e09b0a Rearranged imports in base.py 2017-08-23 20:18:46 +02:00
M.Ravi
0846718893 Rearranged imports 2017-08-23 20:16:27 +02:00
M.Ravi
82b73df6e7 Added test case to check whether celery task executes properly on production. 2017-08-23 20:12:50 +02:00
Arvind Tiwari
78c9931002 mobile view buttons shifted below 2017-08-23 23:31:06 +05:30
Arvind Tiwari
788621bd2b test markup removed 2017-08-23 23:07:40 +05:30
Arvind Tiwari
e6e0bea9b4 increased padding 2017-08-23 21:55:29 +05:30
Arvind Tiwari
302f17a3d3 increased padding 2017-08-23 21:52:23 +05:30
Arvind Tiwari
e50baf50e8 increased padding 2017-08-23 21:51:56 +05:30
Arvind Tiwari
67362b5466 increase width 2017-08-23 21:09:56 +05:30
Arvind Tiwari
9257f73739 ipv6 line break 2017-08-23 21:07:35 +05:30
Arvind Tiwari
e912acd3ca increase max-width for page contents 2017-08-23 21:04:14 +05:30
Arvind Tiwari
4c23d2bd30 contact box, line break 2017-08-23 19:42:49 +05:30
Arvind Tiwari
e15cf7e164 translation fix 2017-08-23 19:35:23 +05:30
Arvind Tiwari
0cac35831a code cleanup, translations fix 2017-08-23 19:22:59 +05:30
Arvind Tiwari
c7b69ec4d9 Merge branch 'master' into task/3697/vm_details_page 2017-08-22 20:45:47 +05:30
PCoder
9eecfbda64 Added hdd parameter as an optional parameter to the subscription plan id 2017-08-22 02:13:12 +05:30
PCoder
487ab6b927 Changed the subscription plan id field size to 256 characters 2017-08-22 01:55:45 +05:30
PCoder
83df42b5df Fixed checking active status of subscription + redirection to payment page on error 2017-08-22 00:07:58 +05:30
Arvind Tiwari
d8b76abda2 translations fixed 2017-08-21 23:41:38 +05:30
Arvind Tiwari
b256199d82 Merge remote-tracking branch 'ungleich/master' 2017-08-21 23:38:54 +05:30
PCoder
506b5a904a Added missing code from the merge 2017-08-21 01:54:55 +05:30
PCoder
29d36faef0 Refactored some code 2017-08-21 00:41:46 +05:30
PCoder
7def893028 Merged origin/master into task/3701/enable_monthly_payments 2017-08-21 00:27:44 +05:30
Pcoder
e20d42e84b Merge pull request #454 from pcoder/task/3711/show_ipv4
Task/3711/Show all IPv4s and IPv6s in the VM
2017-08-20 20:09:38 +02:00
PCoder
4a75da0140 Merge branch 'master' into task/3711/show_ipv4 2017-08-20 23:31:29 +05:30
Arvind Tiwari
653b3654b8 merged master 2017-08-20 22:04:48 +05:30
Arvind Tiwari
eae3b8ff8a Merge pull request #1 from ungleich/master
Update master
2017-08-20 21:47:50 +05:30
Arvind Tiwari
395fa371db my orders page redesigned 2017-08-20 21:40:17 +05:30