Commit graph

2468 commits

Author SHA1 Message Date
PCoder
a32bb9b774 We use the default timezone available to celery 2017-09-05 02:26:00 +05:30
Arvind Tiwari
5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
PCoder
277fcdbac1 cdist: Updated requirements.txt 2017-09-05 00:34:22 +05:30
Arvind Tiwari
3ff0c4a1a2 merged master 2017-09-04 23:52:22 +05:30
Arvind Tiwari
0bdda9a542 Merge remote-tracking branch 'ungleich/master' 2017-09-04 23:43:58 +05:30
PCoder
f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
PCoder
8ac8b25d78 Updated new vm email template 2017-09-04 12:32:53 +05:30
M.Ravi
a98832c6d3 Fixed datacenterlight django.po 2017-09-03 18:49:28 +02:00
M.Ravi
7a4e0760ae Updated account activation txt email template 2017-09-03 18:47:42 +02:00
M.Ravi
d481737518 Fixed subject of account activation email templates 2017-09-03 18:17:25 +02:00
M.Ravi
f7129e0b23 Removed an invalid quote from cancel email template 2017-09-03 17:49:31 +02:00
M.Ravi
52edb5466d Added some translations in utils django.po 2017-09-03 17:22:16 +02:00
M.Ravi
da4ca01524 Fixed hosting django.po error 2017-09-03 17:16:25 +02:00
M.Ravi
43e4c021a7 Removed order id from cancel vm email templates 2017-09-03 17:13:49 +02:00
M.Ravi
a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
M.Ravi
0d4c40cfa2 Fixed missing trans tag in _footer.html 2017-09-03 12:44:42 +02:00
PCoder
f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi
8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi
50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder
b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder
e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder
3a739f1cde Added utils django.po 2017-09-02 17:23:10 +05:30
PCoder
3b444b38b1 Regenerated dcl django.po 2017-09-02 16:53:49 +05:30
PCoder
7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
PCoder
2276533185 Reformatted utils/views.py and added a condition to DCL_TEXT in passoword reset email 2017-09-02 16:36:27 +05:30
PCoder
1c42623964 Fixed some password reset email translation issues 2017-09-02 16:24:25 +05:30
PCoder
f701f10e24 Added missing site_name 2017-09-02 16:07:05 +05:30
PCoder
22f07837e0 Added missing password_reset_url 2017-09-02 16:05:24 +05:30
PCoder
00e4ae5b76 Added missing new line character 2017-09-02 16:03:39 +05:30
PCoder
b4ba882c9c Added password reset email translation 2017-09-02 16:01:39 +05:30
PCoder
7c70ee637a Updated password reset template 2017-09-02 15:56:17 +05:30
PCoder
5381e0fa67 Fixed another incorrect template 2017-09-02 14:30:10 +05:30
PCoder
ede949004e Fixed an incorrect template name 2017-09-02 14:28:18 +05:30
PCoder
61988ae27b Renamed base_email to base_email_datacenterlight 2017-09-02 14:24:23 +05:30
PCoder
cf83a67d51 Further refactored to base_email_datacenterlight.html 2017-09-02 14:17:08 +05:30
PCoder
75611deadd Further refactored user activation email 2017-09-02 13:32:20 +05:30
PCoder
eb79251fc0 Added translation and refactored user activation txt email 2017-09-02 13:25:47 +05:30
PCoder
aecdff2ab7 Made into a single text -- Your Data Center Light Team 2017-09-02 12:47:44 +05:30
PCoder
f4726954b8 Removed Raleway font 2017-09-02 12:35:01 +05:30
PCoder
79f4b38e4c Refactored user activation email 2017-09-02 12:24:10 +05:30
PCoder
39b996ea1a Merge branch 'task/3318/mail_style_fix' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3318/mail_style_fix 2017-09-02 11:03:05 +05:30
PCoder
fd87023681 Merge branch 'master' into task/3731/cdist_ssh_key_handler 2017-09-02 11:00:40 +05:30
Arvind Tiwari
cad5e209ed Updated changelog 1.1.1 -> 1.2 2017-09-02 03:24:50 +05:30
Arvind Tiwari
7d807d4214 Merge branch 'task/3768/translation_fix' 2017-09-02 03:22:58 +05:30
Arvind Tiwari
f0bca697b1 fix 2017-09-02 03:20:32 +05:30
Arvind Tiwari
367b49a0ea Merge pull request #477 from tiwariav/task/3768/translation_fix
Task/3768 translation fixes
2017-09-02 03:14:32 +05:30
Arvind Tiwari
95f4cb3753 fix 2017-09-02 03:14:02 +05:30
Arvind Tiwari
b9f0a886e0 translation fixes 2017-09-02 03:09:02 +05:30
Arvind Tiwari
e524281d16 Merge pull request #466 from pcoder/task/3709/faq_tos_cms_template
Task/3709/Improvements to Data Center Light CMS template
2017-09-02 02:27:46 +05:30
Arvind Tiwari
4b24c227ee Merge pull request #476 from tiwariav/bugfix/hosting_payment_navbar
bugfix/hosting datacenterlight payment template separated
2017-09-02 02:04:32 +05:30