Commit Graph

2129 Commits

Author SHA1 Message Date
Arvind Tiwari b256199d82 Merge remote-tracking branch 'ungleich/master' 2017-08-21 23:38:54 +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 eae3b8ff8a Merge pull request #1 from ungleich/master
Update master
2017-08-20 21:47:50 +05:30
Pcoder bfae8f7585 Merge pull request #438 from pcoder/task/3622/decouple_opennebula_dcl_flow
Task/3622/decouple opennebula from DCL's purchase VM flow
2017-08-20 17:13:51 +02:00
PCoder ddbaf902af Removed __future__ datacenterlight/tasks 2017-08-20 20:23:59 +05:30
PCoder 38fa18b2be Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow 2017-08-20 17:31:59 +05:30
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
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
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 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 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
PCoder 819e798392 Update get_ipv4 and get_ipv6 for multiple nics + Reformatted code 2017-08-19 02:28:48 +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 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
Arvind Tiwari b09477c874 text changed Ipv -> IPv 2017-08-16 20:41:55 +05:30
Arvind Tiwari 079f0ed68d status text capitalization changed to Titlecaps 2017-08-16 20:35:14 +05:30
Arvind Tiwari a2229d3250 created translations 2017-08-16 04:26:17 +05:30
Arvind Tiwari df97a16a26 removed old markup 2017-08-16 04:14:46 +05:30
Arvind Tiwari 337021a470 added other conditional components on page 2017-08-16 04:13:40 +05:30
Arvind Tiwari 8160e53ea7 removed commented html 2017-08-16 04:10:08 +05:30
Arvind Tiwari aec4073af5 removed testing markup from html 2017-08-16 04:08:44 +05:30
Arvind Tiwari e92e3a9527 new design for page /my-virtual-machines 2017-08-16 04:02:22 +05:30
PCoder 94004a5443 Changed 1.0.23.1 to 1.0.24 in the Changelog 2017-08-16 03:30:21 +05:30
PCoder 270e70580f Updated Changelog for 1.0.24 2017-08-16 03:27:37 +05:30
Pcoder 2d7231caa0 Merge pull request #449 from pcoder/task/3687/stripe_customer_description
Added code to store customer's name in Stripe's description field.
2017-08-15 22:16:07 +02:00
Pcoder c053c76186 Merge pull request #448 from pcoder/task/3699/add_oneadmin_ssh_key
Task/3699/Added oneadmin ssh key by default to the created VM via DCL flow
2017-08-15 20:08:52 +02:00
PCoder 999f5d8e2d Cleaned up a comment 2017-08-15 18:48:29 +05:30
PCoder 492f7553d8 Added test TestStripeCustomerDescription 2017-08-15 16:12:08 +05:30
PCoder 3be7fbe2ee Added name parameter for creating StripeCustomer and set description to this 2017-08-15 16:05:52 +05:30
PCoder 73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
Pcoder 3b1cd200d6 Merge pull request #430 from amarynets/bugfix/add_customuser_parameter
Fixed `TypeError: get_anonymous_user_instance() takes 0 positional arguments but 1 was given`
2017-08-12 19:26:02 +02:00
Arvind Tiwari dbb4c7b3f3 Update Changelog 2017-08-12 02:44:40 +05:30
Arvind Tiwari f618ce8bdf fixes in changelog 2017-08-12 02:42:52 +05:30
Arvind Tiwari 3f37fdd77a Update Changelog 2017-08-12 02:42:11 +05:30
Arvind Tiwari 26903015fe corrected format for changelog 2017-08-12 02:39:04 +05:30
Arvind Tiwari 01156a335d update changelog 1.0.23 2017-08-12 02:33:37 +05:30
Arvind Tiwari 0efd844603 Update Changelog 2017-08-12 02:25:07 +05:30
Arvind Tiwari dde18cc485 Merge pull request #443 from ungleich/task/3676/missing_card_holder_name_migration
Task/3676/Added migration file for missing card holder's name in utils_billing_…
2017-08-12 02:21:19 +05:30
Arvind Tiwari 2f832e6409 Update Changelog 2017-08-12 02:17:07 +05:30
Arvind Tiwari 7825114f5e Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer
bugfix/3683 footer fix on hosting
2017-08-12 01:28:31 +05:30
ARvind Tiwari 07f92e754e fix for mobile 2017-08-12 01:18:14 +05:30