Commit graph

1613 commits

Author SHA1 Message Date
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
M.Ravi
663ea2d713 Merged master into feature/manualorder 2017-06-07 00:41:27 +05:30
M.Ravi
69001db65f Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files. 2017-06-07 00:16:54 +05:30
M.Ravi
b7bae03fd7 Merge branch 'henrys_pr' into feature/manualorder 2017-06-06 22:15:26 +05:30
M.Ravi
9ffd32b4cb Merge branch 'master' of https://github.com/HenryGBC/dynamicweb into henry_pr 2017-06-06 22:10:35 +05:30
Henry Bravo
6f6277cc49 Mobile styles to calculator card 2017-06-06 10:36:47 -05:00
Henry Bravo
b5f93e4ea7 align buttons 2017-06-06 10:33:36 -05:00
Levi
96272ffd44 added mo files 2017-06-06 00:08:22 -05:00
Levi
6fa14971d9 Merge branch 'master' of github.com:ungleich/dynamicweb 2017-06-05 23:08:58 -05:00
Levi
596896c700 Merge branch 'HenryGBC-develop' into develop 2017-06-05 22:52:09 -05:00
Levi
a355ae9087 Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop 2017-06-05 22:51:53 -05:00
Levi Velázquez
7fcd72086a Merge pull request #312 from telmich/cleanup_201706
Cleanup 201706
2017-06-05 22:26:13 -05:00
Levi Velázquez
b7faceb5dc Merge pull request #311 from Modulos/fix/ssh_typo
Typo public_key -> ssh_key
2017-06-05 22:26:04 -05:00
M.Ravi
d31b05a219 Added jquery validation for the order form 2017-06-06 05:26:02 +05:30
M.Ravi
74c57a42db Added top margin style for error messages 2017-06-06 05:24:39 +05:30
M.Ravi
949f47d124 Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template 2017-06-06 04:28:41 +05:30
M.Ravi
b54b46c08b Renamed success url to order_success for clarity. 2017-06-06 04:23:15 +05:30