Levi Velázquez
|
8481a4c7cc
|
Merge pull request #333 from levivm/develop
Develop
|
2017-06-12 23:52:15 -05:00 |
|
Levi
|
c7d29be24c
|
Merge branch 'master' into develop
|
2017-06-12 23:51:03 -05:00 |
|
M.Ravi
|
1a37ce2817
|
Updated Changelog
|
2017-06-13 05:10:12 +05:30 |
|
M.Ravi
|
9354cad626
|
Updated Changelog
|
2017-06-13 05:09:01 +05:30 |
|
M.Ravi
|
1a7615dc9a
|
Fixed a typo
|
2017-06-13 05:03:46 +05:30 |
|
Pcoder
|
8f85a1b4bd
|
Merge pull request #332 from pcoder/bug/email_from_address_missing
Added from_address to EmailMessage
|
2017-06-13 01:11:44 +02:00 |
|
M.Ravi
|
83802a0a52
|
Added from_address to EmailMessage
|
2017-06-13 04:39:30 +05:30 |
|
M.Ravi
|
a60e799e08
|
Updated changelog
|
2017-06-13 03:14:03 +05:30 |
|
Pcoder
|
364ba07b67
|
Merge pull request #331 from verysanghee/bugfix/add_month
month added to landing calculator box
|
2017-06-12 23:38:49 +02:00 |
|
|
|
f2aa5377d8
|
month added to landing calculator box
|
2017-06-11 23:32:37 +02:00 |
|
Levi Velázquez
|
ca2a10645d
|
Merge pull request #328 from levivm/develop
fixing 500 error
|
2017-06-11 13:00:22 -05:00 |
|
Levi
|
993039c020
|
fixing 500 error
|
2017-06-11 12:59:57 -05:00 |
|
Levi Velázquez
|
2f0b38302a
|
Merge pull request #316 from pcoder/bug/3328/dcl_email_headers
Changed BaseEmail to accept from_address to modify the from header ac…
|
2017-06-11 12:30:29 -05:00 |
|
Levi Velázquez
|
d2a8c13b9e
|
Merge branch 'master' into bug/3328/dcl_email_headers
|
2017-06-11 12:30:09 -05:00 |
|
Levi Velázquez
|
d2d62bf990
|
Merge pull request #327 from levivm/develop
Develop
|
2017-06-11 12:22:59 -05:00 |
|
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 |
|
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 |
|
Levi
|
d43855adda
|
fixed #3350, #3328, #3316, #3339
|
2017-06-09 15:36:14 -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 |
|
