PCoder
|
7c9ec6fdde
|
Added contact us migrations after --merge with the existing migrations
|
2017-08-27 16:42:14 +05:30 |
|
PCoder
|
28bcef082c
|
Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message
|
2017-08-27 16:41:39 +05:30 |
|
PCoder
|
6cca92ec3a
|
Reformatted dcl's _navbar.html.
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
|
2017-08-27 16:37:49 +05:30 |
|
M.Ravi
|
b044acab5d
|
Refactored class names to better names
|
2017-08-27 16:37:49 +05:30 |
|
M.Ravi
|
597541a2ee
|
Updated _navbar to show menu on other pages except for index and whydcl
|
2017-08-27 16:37:49 +05:30 |
|
M.Ravi
|
8caeaf0217
|
Added cms.css and renamed faq.html to cms_page.html
|
2017-08-27 16:37:48 +05:30 |
|
PCoder
|
189adbadfb
|
Added cms_tags, sekizai_tags and cms_toolbar
|
2017-08-27 16:37:48 +05:30 |
|
PCoder
|
cd67bb9938
|
Added faq.html cms template
|
2017-08-27 16:37:48 +05:30 |
|
PCoder
|
6c1307d1d3
|
Reverted back to original title in base.html
|
2017-08-26 21:01:21 +05:30 |
|
PCoder
|
af713a0e96
|
cms_page.html: Added placeholder for title tag
|
2017-08-26 20:49:17 +05:30 |
|
PCoder
|
0be3266ed3
|
Moved cms toolbar before title tag
|
2017-08-26 20:46:51 +05:30 |
|
PCoder
|
2a76167d10
|
Merge branch 'master' into task/3709/faq_tos_cms_template
|
2017-08-24 23:59:09 +05:30 |
|
M.Ravi
|
7153b635e5
|
Removed (incl. VAT) text in hosting,dcl payment template
|
2017-08-24 13:29:39 +02:00 |
|
M.Ravi
|
60df9a888c
|
Added translation for month
|
2017-08-24 12:48:30 +02:00 |
|
PCoder
|
f2b0ff04ca
|
Added text and styles for monthly payment clarification
|
2017-08-24 13:41:48 +05:30 |
|
PCoder
|
eab0c9fac1
|
Added price to specs as it is being used in create_vm_task
|
2017-08-24 12:30:17 +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
|
a964f2fb5b
|
Merged master into task/3701/enable_monthly_payments
|
2017-08-24 04:06:48 +05:30 |
|
PCoder
|
6484684ac5
|
Removed unncessary check for error for make_charge
|
2017-08-24 02:29:24 +05:30 |
|
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 |
|
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
|
a0d5b4d04f
|
removed Lato font files from web server, and its usage from css files
|
2017-08-21 23:35:17 +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
|
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
|
7def893028
|
Merged origin/master into task/3701/enable_monthly_payments
|
2017-08-21 00:27:44 +05:30 |
|
PCoder
|
ddbaf902af
|
Removed __future__ datacenterlight/tasks
|
2017-08-20 20:23:59 +05:30 |
|
Arvind Tiwari
|
65ac2df002
|
dropdown style changed to match landing page style
|
2017-08-20 01:46:26 +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
|
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
|
2b71795431
|
Added missing oneadmin's ssh key statement
|
2017-08-19 18:02:55 +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
|
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
|
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 |
|
PCoder
|
1a2b0e4e29
|
Added datacenterlight/migrations/0007_stripeplan.py migration file
|
2017-08-17 04:26:04 +05:30 |
|
PCoder
|
fc1ddbdd3b
|
Added StripePlan model
|
2017-08-17 04:22:23 +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 |
|
ARvind Tiwari
|
7cf46ad8b8
|
override bootstrap default danger color #a94442 -> #eb4d5c
|
2017-08-09 00:21:25 +05:30 |
|
ARvind Tiwari
|
451f2a141e
|
file reformated
|
2017-08-08 22:46:00 +05:30 |
|
ARvind Tiwari
|
6c4e0067ba
|
font-family changed to 'Lato' in all css files
|
2017-08-08 00:35:58 +05:30 |
|
ARvind Tiwari
|
5cea467deb
|
master merged
|
2017-08-07 22:23:51 +05:30 |
|
Siarhei Puhach
|
72ddfd96ab
|
Payment error was unified
|
2017-08-07 17:23:58 +03:00 |
|
Siarhei Puhach
|
a71ccbc566
|
Added error hash in url, added payment error handler to hosting/views
|
2017-08-07 17:02:47 +03:00 |
|
Siarhei Puhach
|
4cd3d6a4aa
|
Added stripe make_charge error handler
|
2017-08-07 13:36:21 +03:00 |
|
M.Ravi
|
29b28d551c
|
Fixed flake8 lint warnings
|
2017-08-06 22:19:27 +02:00 |
|
M.Ravi
|
58bb754814
|
Introduced MaxRetries and MaxRetriesExceededError handling code
|
2017-08-06 21:54:12 +02:00 |
|
M.Ravi
|
e7864f5d85
|
Added condition to check if create_vm succeeded
|
2017-08-06 18:52:28 +02:00 |
|
M.Ravi
|
f950c1defb
|
Added datacenterlight/tasks.py
|
2017-08-06 18:42:27 +02:00 |
|
M.Ravi
|
bd2edf599a
|
Merged views from master
|
2017-08-06 15:08:05 +02:00 |
|
M.Ravi
|
3ad5928aa0
|
A working version of celery create_vm_task added
|
2017-08-06 14:33:55 +02:00 |
|
Pcoder
|
90f01c277b
|
Merge pull request #436 from tiwariav/task/3660/webringfuture
task #3660 whydatacenterlight 'we bring future' section
|
2017-08-04 21:02:53 +02:00 |
|
Pcoder
|
5f71b19fb1
|
Merge pull request #429 from amarynets/bugfix/add_vmtemplate_mig_file
Add file with VMTemplate hosting migrations
|
2017-08-04 19:44:34 +02:00 |
|
ARvind Tiwari
|
d93942fa0b
|
heading sizes changed
|
2017-08-04 18:32:34 +05:30 |
|
ARvind Tiwari
|
6cef45beee
|
lead line break and alignment fixed
|
2017-08-04 17:20:53 +05:30 |
|
Siarhei Puhach
|
657e97fc6d
|
Merge branch 'master' into feature/task3637
|
2017-08-04 11:05:37 +03:00 |
|
Siarhei Puhach
|
29fb771afb
|
Changed payment error place, changed message source to Stripe errors handler
|
2017-08-04 11:01:32 +03:00 |
|
PCoder
|
94bc552f75
|
Resolved conflicts
|
2017-08-04 03:25:47 +05:30 |
|
Pcoder
|
3d051aee14
|
Merge pull request #428 from tiwariav/task/3620/ssh_keys
task/3620 ssh_keys_choice page new design
|
2017-08-03 22:53:12 +02:00 |
|
ARvind Tiwari
|
9d37e3f58c
|
views fix
|
2017-08-04 00:58:54 +05:30 |
|
ARvind Tiwari
|
8edbd29fad
|
navbar made white, dropdown fix
|
2017-08-03 23:18:58 +05:30 |
|
ARvind Tiwari
|
0993d8c106
|
reviewed changes
|
2017-08-03 22:00:41 +05:30 |
|
Siarhei Puhach
|
34acf2310b
|
Added stripe failed payment error handler
|
2017-08-03 12:47:34 +03:00 |
|
ARvind Tiwari
|
3081786f0b
|
merged master, conflict resolved
|
2017-08-03 03:27:46 +05:30 |
|
ARvind Tiwari
|
fda20eacd6
|
translation fix and font-weight bold
|
2017-08-03 03:12:40 +05:30 |
|
ARvind Tiwari
|
a3d5c81530
|
navbar fixed on payment, order-success, order-confirmation
|
2017-08-03 02:35:44 +05:30 |
|
Pcoder
|
4d33837069
|
Merge pull request #420 from tiwariav/task/3553
why datacenterlight page, 'we bring the future' section layout
|
2017-08-02 22:57:00 +02:00 |
|
Andrii Marynets
|
e13d802f28
|
Add file with VMTemplate hosting migrations
|
2017-08-02 23:40:00 +03:00 |
|
PCoder
|
9c2c5ba56a
|
Changed Preis -> Preise in the Whydatacenterlight footer
|
2017-08-01 00:55:35 +05:30 |
|
PCoder
|
c1409d5ca1
|
Improved validation error message texts and their DE translations
|
2017-08-01 00:01:19 +05:30 |
|
ARvind Tiwari
|
8aac161196
|
Merge branch 'master' into task/3354/modal_restyling
|
2017-07-31 20:17:17 +05:30 |
|
ARvind Tiwari
|
a2f705f012
|
Merge branch 'master' into feature/3517/ssh_keys
|
2017-07-31 18:50:07 +05:30 |
|
ARvind Tiwari
|
f4880ae136
|
font weight bold for titles
|
2017-07-31 18:44:13 +05:30 |
|
ARvind Tiwari
|
e6208ee639
|
font size to 32px
|
2017-07-31 18:19:09 +05:30 |
|
ARvind Tiwari
|
bb061c67d0
|
Merge branch 'master' into task/3553
|
2017-07-31 18:17:30 +05:30 |
|
ARvind Tiwari
|
6b77d2eaff
|
Merge branch 'master' into task/3553
|
2017-07-31 18:14:02 +05:30 |
|
ARvind Tiwari
|
aa4bfbdd31
|
font size reduced for mobile
|
2017-07-31 17:56:03 +05:30 |
|
PCoder
|
dc5d45d674
|
Added trans tag to All rights reserved
|
2017-07-31 01:00:43 +05:30 |
|
PCoder
|
98d0409219
|
Updated dcl .po, added DE translation for All rights reserved
|
2017-07-31 00:59:33 +05:30 |
|
ARvind Tiwari
|
6c63797e7c
|
merged PR #413
|
2017-07-29 18:51:13 +05:30 |
|
ARvind Tiwari
|
391d123f31
|
nav js modified
|
2017-07-29 18:37:56 +05:30 |
|
Pcoder
|
abbb217848
|
Merge pull request #404 from amarynets/bugfix/warning_messages
Fix warning messages and deprecated url #3542
|
2017-07-28 22:26:32 +02:00 |
|
ARvind Tiwari
|
10108f7d93
|
merged master
|
2017-07-28 17:45:38 +05:30 |
|
ARvind Tiwari
|
4995604873
|
minor padding adjustments
|
2017-07-28 17:39:20 +05:30 |
|
ARvind Tiwari
|
d6b3ee5e09
|
merged master
|
2017-07-28 17:12:14 +05:30 |
|
ARvind Tiwari
|
9bd9ec5971
|
merged master
|
2017-07-28 16:48:50 +05:30 |
|
ARvind Tiwari
|
925252f1c9
|
merged master
|
2017-07-28 16:45:34 +05:30 |
|