Commit graph

1529 commits

Author SHA1 Message Date
Levi
d7a38dffa2 added changelog 2017-06-11 12:20:25 -05:00
Levi
817f800fbd fixed #3350 2017-06-11 11:44:14 -05:00
M.Ravi
98b9e2ee92 Updated Changelog 2017-06-11 20:19:49 +05:30
M.Ravi
792280f112 Updated changelog 2017-06-11 20:12:46 +05:30
M.Ravi
620e93bb9f Merge branch 'telmich-feature/nonhtml-email' 2017-06-11 20:07:54 +05:30
M.Ravi
943fc741bf Modified the IndexView to send text email on receiving new order 2017-06-11 20:06:54 +05:30
M.Ravi
d7a2335cf4 Merge branch 'master' into telmich-feature/nonhtml-email 2017-06-11 19:56:35 +05:30
M.Ravi
c5fdb3da5a Updated change log 2017-06-11 19:51:54 +05:30
Nico Schottelius
1d1743828b Merge pull request #325 from pcoder/feature/3371/calc_in_landing
Feature/3371/calculator in landing page
2017-06-11 16:15:42 +02:00
M.Ravi
a29ceb765f Updated the translation for the modified text 2017-06-11 17:46:42 +05:30
M.Ravi
8e95ed304b Updated the text in dcl index.html template 2017-06-11 16:57:20 +05:30
M.Ravi
24402a2ec8 Refactored the styles 2017-06-11 16:53:57 +05:30
M.Ravi
880e0f0dde Added functions to handle get and post requests. On get, we need to create a opennebula connection to fetch the templates. On successful post of the form, we need to send email and redirect user to order-success 2017-06-11 16:32:38 +05:30
M.Ravi
47d882d1fc Moved the calculator to the index.html template 2017-06-11 16:29:24 +05:30
M.Ravi
d792c22e4e Created landing page style price-calc-section-landing which is same as price-calc-section except for padding (we don't need it in the landing page) 2017-06-11 16:28:11 +05:30
M.Ravi
9b40af3975 Removed the unnecessary new_order_notification* email templates as we no longer use them. 2017-06-10 15:41:25 +05:30
M.Ravi
3750ba5182 Changed the to and reply-to fields for EmailMessage to list, as it expects input of that type 2017-06-10 12:42:31 +05:30
Nico Schottelius
9f2f0f7db3 Send order emails as plain text 2017-06-10 00:33:26 +02:00
Henry Bravo
d2e9096cc2 Fix conflicts in url footer and fix navbar language 2017-06-09 16:47:39 -05:00
Henry Bravo
7004536a19 Fix conflicts 2017-06-09 16:18:41 -05:00
Levi Velázquez
def473e5ef Merge pull request #321 from levivm/develop
footer links
2017-06-09 16:09:30 -05:00
Levi
24ecdd2f26 footer links 2017-06-09 16:08:37 -05:00
Levi Velázquez
7b197ec75b Merge pull request #320 from levivm/develop
fixed #3350, #3328, #3316,  #3339
2017-06-09 15:39:12 -05:00
Henry Bravo
54b339a546 Staging fix and cleaned html 2017-06-09 15:37:14 -05:00
Levi
d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
Henry Bravo
7485c182c4 Redesign vm order page 2017-06-09 13:55:45 -05:00
Levi Velázquez
db5d0f864c Merge pull request #314 from levivm/develop
Henrys Changes (Need to test)
2017-06-09 10:42:02 -05:00
Levi
331b7dea98 Merge branch 'master' into develop 2017-06-09 10:37:06 -05:00
M.Ravi
ce33a4b3f2 Updated Changelog 2017-06-09 12:38:25 +05:30
M.Ravi
132629734a Merge branch 'telmich-feature/introduce_templating' 2017-06-09 12:34:15 +05:30
M.Ravi
a679d83910 Merge branch 'pcoder-bug-fix/3363/de_typos' 2017-06-09 12:33:45 +05:30
M.Ravi
382b0b979d Modified po/mo files to fix de typos (bug 3363) 2017-06-09 12:10:36 +05:30
M.Ravi
47970fb00a Added load staticfiles and i18n and extended datacenterlight/base.html explicitly 2017-06-09 11:32:51 +05:30
Nico Schottelius
b15bae4940 Add template base.html 2017-06-08 21:55:35 +02:00
M.Ravi
a1dd4b2941 Updated changelog 2017-06-08 11:40:01 +05:30
Pcoder
154277ca8d Merge pull request #317 from pcoder/master
Fixed a bug due to i18n not loaded in html template. This caused the …
2017-06-08 02:25:36 +02:00
M.Ravi
31107ff4e1 Fixed a bug due to i18n not loaded in html template. This caused the images in the posts of the blog not to appear. 2017-06-08 05:50:32 +05:30
M.Ravi
a60ef7cf7a Changed BaseEmail to accept from_address to modify the from header accordingly 2017-06-07 11:35:16 +05:30
M.Ravi
a44f64e8e7 Merge branch 'feature/manualorder' 2017-06-07 03:05:26 +05:30
M.Ravi
cd524350d8 Attempted manual merge to avoid conflicts 2017-06-07 03:05:21 +05:30
M.Ravi
de76ef140b Updated Changelog 2017-06-07 02:56:42 +05:30
M.Ravi
a131489e8c Fixed font on order page for mobile view. Changed from Lato-black to Montserrat-Bold 2017-06-07 02:40:45 +05:30
M.Ravi
d8ef935fae Updated text on the button to Request Beta Access to go along the text alongside 2017-06-07 02:13:21 +05:30
M.Ravi
06f95dc5ed Made to take the user to /order on click of Order Now button 2017-06-07 02:12:35 +05:30
M.Ravi
94bac7222c Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before. 2017-06-07 02:02:31 +05:30
M.Ravi
bef6b03872 Reverted pricing.html to what was before. We should create a new template for order. 2017-06-07 01:35:05 +05:30
M.Ravi
c111ad13a8 Updated translation text after completion of manual order. 2017-06-07 01:26:56 +05:30
M.Ravi
366f11be83 Fixed an issue related to redirection to datacenterlight/order url 2017-06-07 01:07:47 +05:30
M.Ravi
6a3f4578db Updated mo file to include the change for exclamation mark missing in german translation 2017-06-07 00:59:19 +05:30
M.Ravi
dcdb06d4f6 Added missing exlamation mark for german translation. Updated the translation 2017-06-07 00:47:40 +05:30