Commit graph

2642 commits

Author SHA1 Message Date
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
Arvind Tiwari
979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari
fa5bf56f73 Merge pull request #475 from tiwariav/bugfix/translation
Bugfix/translation
2017-09-02 01:50:29 +05:30
Arvind Tiwari
1426cba3a5 approved, declined translations added 2017-09-02 01:48:51 +05:30
Arvind Tiwari
6f091279d7 translation fix on vm list page 2017-09-02 01:45:07 +05:30
Arvind Tiwari
654f7715c8 Updated changelog 1.1.1 -> 1.2 2017-09-02 01:39:53 +05:30
Arvind Tiwari
5f384d430b Merge pull request #474 from tiwariav/task/3735/modal_btn_width
Task/3735 modal btn min-width, modal width increased
2017-09-02 00:32:08 +05:30
Arvind Tiwari
765432acbc minor fix 2017-09-02 00:17:01 +05:30
Arvind Tiwari
4a3ab29bd5 minor fix 2017-09-02 00:14:12 +05:30
Arvind Tiwari
31552b886f btn styles fixed 2017-09-02 00:11:16 +05:30
Arvind Tiwari
79cf5e416c modal btn min width, modal width increased 2017-09-01 23:56:01 +05:30
Arvind Tiwari
2fe3232d91 Merge branch 'master' into task/3704/my_settings 2017-09-01 23:14:32 +05:30
Arvind Tiwari
b622e53313 translation fix, master merged 2017-09-01 23:13:54 +05:30
Arvind Tiwari
cc5eaa4047 new template for datacenterlight/payment 2017-09-01 23:06:57 +05:30
Arvind Tiwari
03a96f5457 Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
Task/3678 remove lato font files
2017-09-01 22:53:52 +05:30
Arvind Tiwari
17ca314808 Merge pull request #434 from tiwariav/bugfix/3634/navbar
Bugfix/3634 navbar options added on payments, order-success, order-confirmation
2017-09-01 22:17:50 +05:30
PCoder
1bc78ceb5d Added save_ssh_key_error_handler 2017-09-01 02:33:31 +05:30
Arvind Tiwari
ffa0abee34 contact link fix 2017-09-01 02:16:18 +05:30
Arvind Tiwari
b1baf564db navbar-header clickable, contact href fixed, highlights focus color fixed 2017-09-01 02:05:24 +05:30
PCoder
a72287be5c Changed a string format 2017-09-01 01:32:31 +05:30
Arvind Tiwari
fa538e7747 landing buttons fixed 2017-09-01 01:32:06 +05:30
Arvind Tiwari
5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
PCoder
8eca78b043 Reorganized imports hosting/forms.py 2017-09-01 00:58:30 +05:30
PCoder
3b0d2f8802 Merge branch 'master' into task/3731/cdist_ssh_key_handler 2017-09-01 00:53:30 +05:30
PCoder
6933ad5900 Updated requirements for cdist 2017-09-01 00:51:58 +05:30
Arvind Tiwari
3ed2399337 merge master 2017-09-01 00:39:01 +05:30
Arvind Tiwari
1555264ccc Merge pull request #471 from tiwariav/task/3765/ssh_keys_text_fix
Bugfix/3765 ssh key heading changed 'Your SSH Keys' -> 'My SSH Keys'
2017-08-31 23:48:06 +05:30
Arvind Tiwari
d0e770d0df merge conflict resolved 2017-08-31 23:47:42 +05:30