Arvind Tiwari
|
fb82ef6018
|
Merge pull request #450 from tiwariav/task/3695/vm_list_design
task/3695 new design for hosting/my-virtual-machines
|
2017-08-20 03:00:52 +05:30 |
|
Arvind Tiwari
|
e7708f5652
|
active menu bug fix
|
2017-08-20 02:21:02 +05:30 |
|
Arvind Tiwari
|
8daf260748
|
dropdown style changed to match landing page style
|
2017-08-20 01:51:28 +05:30 |
|
Arvind Tiwari
|
65ac2df002
|
dropdown style changed to match landing page style
|
2017-08-20 01:46:26 +05:30 |
|
PCoder
|
bab57c4fc9
|
Merge branch 'master' into task/3711/show_ipv4
|
2017-08-20 01:40:22 +05:30 |
|
PCoder
|
69f5aea560
|
Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow
|
2017-08-20 01:39:12 +05:30 |
|
PCoder
|
bc43d9225a
|
Merge branch 'master' into task/3709/faq_tos_cms_template
|
2017-08-20 01:37:54 +05:30 |
|
PCoder
|
9a0592ec4b
|
Merge branch 'master' into task/3701/enable_monthly_payments
|
2017-08-20 01:36:45 +05:30 |
|
Arvind Tiwari
|
b0cdd684e8
|
removed duplicate highlights button
|
2017-08-20 00:51:21 +05:30 |
|
Arvind Tiwari
|
308cb558a3
|
removed debug.log, fixed translation
|
2017-08-20 00:34:22 +05:30 |
|
Arvind Tiwari
|
6764e1ccee
|
Merge pull request #441 from tiwariav/task/3565/warning-color
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
|
2017-08-20 00:29:21 +05:30 |
|
PCoder
|
777102c387
|
Updated deploy.sh: corrected terminology
|
2017-08-19 18:32:58 +05:30 |
|
PCoder
|
422b0ca93e
|
Updated deploy.sh
- Added --dbmakemigrations to do makemigrations
- Added call to restart celery
|
2017-08-19 18:28:21 +05:30 |
|
PCoder
|
2b71795431
|
Added missing oneadmin's ssh key statement
|
2017-08-19 18:02:55 +05:30 |
|
PCoder
|
9c8bddb200
|
requirements.txt: Added celery, redis, django-celery-results
|
2017-08-19 08:41:36 +05:30 |
|
PCoder
|
f28f55c775
|
faq.html now referred as DCL.Faq
|
2017-08-19 06:41:29 +05:30 |
|
PCoder
|
687cf96287
|
Added cms_tags, sekizai_tags and cms_toolbar
|
2017-08-19 06:39:56 +05:30 |
|
PCoder
|
17fbaa59be
|
Added faq.html cms template
|
2017-08-19 06:37:40 +05:30 |
|
PCoder
|
339a6283cd
|
Removed unused imports
|
2017-08-19 03:32:30 +05:30 |
|
PCoder
|
6b7ae88f74
|
Merged master into task/3622/decouple_opennebula_dcl_flow
|
2017-08-19 03:24:22 +05:30 |
|
PCoder
|
d071a1b98a
|
Merge branch 'master' into task/3701/enable_monthly_payments
|
2017-08-19 02:52:19 +05:30 |
|
PCoder
|
a8c5bd8367
|
Merge branch 'master' into task/3711/show_ipv4
|
2017-08-19 02:49:44 +05:30 |
|
Arvind Tiwari
|
8868aabf59
|
added .log to .gitignore
|
2017-08-19 02:42:50 +05:30 |
|
Arvind Tiwari
|
a55170dcf2
|
copied tooltip position chaged to left from bottom
|
2017-08-19 02:40:54 +05:30 |
|
Arvind Tiwari
|
de481e8114
|
invoice link fixed
|
2017-08-19 02:32:37 +05:30 |
|
PCoder
|
819e798392
|
Update get_ipv4 and get_ipv6 for multiple nics + Reformatted code
|
2017-08-19 02:28:48 +05:30 |
|
Arvind Tiwari
|
377f82319d
|
buttons made to work
|
2017-08-19 02:21:34 +05:30 |
|
Arvind Tiwari
|
752e5f53d8
|
translations
|
2017-08-19 00:02:12 +05:30 |
|
Arvind Tiwari
|
3dc41edefb
|
mobile border glitch solved
|
2017-08-18 23:51:27 +05:30 |
|
Arvind Tiwari
|
5e5e33ce70
|
alignment and last item border
|
2017-08-18 23:27:57 +05:30 |
|
PCoder
|
35736ae593
|
Refactored some code
|
2017-08-18 01:49:27 +05:30 |
|
PCoder
|
7e1bfc9fab
|
Removed a print
|
2017-08-18 00:47:34 +05:30 |
|
PCoder
|
fc70c30f21
|
Merged master into task/3701/enable_monthly_payments
|
2017-08-18 00:40:57 +05:30 |
|
Pcoder
|
a80b0668a2
|
Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
|
2017-08-17 20:50:18 +02:00 |
|
M.Ravi
|
3445579a8e
|
Added 0042_hostingorder_subscription_id.py migration file
|
2017-08-17 18:36:14 +02:00 |
|
M.Ravi
|
fcaa5e31dd
|
Added condition that the status should be 'active' for new subscription
|
2017-08-17 18:31:27 +02:00 |
|
M.Ravi
|
171a463261
|
Updated dcl views.py to create subscriptions instead of one time charge
|
2017-08-17 18:24:10 +02:00 |
|
M.Ravi
|
5fe6007ad2
|
Refactored code and added app as a parameter in get_stripe_plan_id
|
2017-08-17 18:21:53 +02:00 |
|
M.Ravi
|
b0b1b6091a
|
Refactored code and added app as a parameter in get_stripe_plan_id
|
2017-08-17 18:17:52 +02:00 |
|
M.Ravi
|
ecbbe1eb6d
|
Added subscription_id field and reformatted the code
|
2017-08-17 18:16:36 +02:00 |
|
M.Ravi
|
5c92e47ffe
|
Added card that fails and a new test case to test failed payment
|
2017-08-17 16:42:32 +02:00 |
|
M.Ravi
|
0bc1766e4a
|
Refactored tests and added test_subscribe_customer_to_plan
|
2017-08-17 15:32:13 +02:00 |
|
M.Ravi
|
ffd0d24f1a
|
Refactored code
|
2017-08-17 13:23:49 +02:00 |
|
M.Ravi
|
3ef34d84a8
|
Added some comments and improved the test code
|
2017-08-17 13:02:39 +02:00 |
|
M.Ravi
|
1073b25a94
|
Refactored and added test_delete_unexisting_plan_should_fail
|
2017-08-17 12:43:42 +02:00 |
|
M.Ravi
|
2a348c40d1
|
Refactored code and added delete_stripe_plan method
|
2017-08-17 12:42:34 +02:00 |
|
M.Ravi
|
bba82e95d1
|
Cleaned up some unused code
|
2017-08-17 11:04:22 +02:00 |
|
PCoder
|
08c5485352
|
Added test_create_duplicate_plans_error_handling
|
2017-08-17 13:01:48 +05:30 |
|
PCoder
|
783ab5714c
|
Improved get_or_create_plan and subscribe_customer_to_plan
|
2017-08-17 13:01:05 +05:30 |
|
PCoder
|
1a2b0e4e29
|
Added datacenterlight/migrations/0007_stripeplan.py migration file
|
2017-08-17 04:26:04 +05:30 |
|