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
|
6c80f94f67
|
Reformatted dcl's _navbar.html.
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
|
2017-08-21 23:16:55 +05:30 |
|
M.Ravi
|
6339442bfe
|
Merge branch 'master' into task/3709/faq_tos_cms_template
|
2017-08-21 18:01:28 +02:00 |
|
M.Ravi
|
696af58bff
|
Refactored class names to better names
|
2017-08-21 18:00:41 +02:00 |
|
M.Ravi
|
7d7260ce6d
|
Renamed faq.html to cms_page.html
|
2017-08-21 17:59:56 +02:00 |
|
M.Ravi
|
c8dcd65adc
|
Updated _navbar to show menu on other pages except for index and whydcl
|
2017-08-21 17:52:57 +02:00 |
|
M.Ravi
|
090f338878
|
Added cms.css and renamed faq.html to cms_page.html
|
2017-08-21 17:51:38 +02:00 |
|
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 |
|
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
|
4684d87c5c
|
translation fixes
|
2017-08-20 03:42:09 +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 |
|
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
|
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 |
|