Commit Graph

115 Commits

Author SHA1 Message Date
Arvind Tiwari be0c50aa2f error msgs translation 2017-09-23 19:01:22 +05:30
Arvind Tiwari 6be245a811 merged master 2017-09-21 19:38:47 +05:30
Arvind Tiwari 1c0f0da96e conditional texts 2017-09-21 19:32:22 +05:30
PCoder 2c2ee0f4a4 Some more translations 2017-09-21 02:18:39 +05:30
PCoder 3eeaba8715 Added some translations 2017-09-21 02:06:50 +05:30
M.Ravi bd45577c90 Removed unwanted translations in hosting django.po 2017-09-14 14:28:52 +02:00
PCoder face045090 Updated hosting django.po 2017-09-14 00:50:24 +05:30
PCoder d40403c15c Updated hosting django.po 2017-09-13 07:31:22 +05:30
PCoder 825a994979 Updated hosting django.po 2017-09-13 00:10:45 +05:30
PCoder 1a43f4f810 Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 20:30:50 +05:30
PCoder f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 13:44:46 +05:30
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
M.Ravi cf6bd8a7c1 Validating ssh public keys using sshpubkeys 2017-09-07 00:31:15 +02:00
Arvind Tiwari 5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
Arvind Tiwari 3ff0c4a1a2 merged master 2017-09-04 23:52:22 +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 f7129e0b23 Removed an invalid quote from cancel email template 2017-09-03 17:49:31 +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 8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
PCoder e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder 7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +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
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 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 31552b886f btn styles fixed 2017-09-02 00:11:16 +05:30
Arvind Tiwari b622e53313 translation fix, master merged 2017-09-01 23:13:54 +05:30
Arvind Tiwari d0e770d0df merge conflict resolved 2017-08-31 23:47:42 +05:30
Arvind Tiwari cf673c8f90 icon added to my settings page 2017-08-31 22:47:47 +05:30
Arvind Tiwari f5bf44ad7b translation fix 2017-08-31 20:16:57 +05:30
Arvind Tiwari da41045b0f ssh key heading changed 'Your SSH Keys' -> 'My SSH Keys' 2017-08-31 20:02:20 +05:30
Arvind Tiwari a07922e4d4 style and translations fix 2017-08-31 15:54:01 +05:30
Arvind Tiwari 9ab82298c5 edit card, remove settings styles 2017-08-30 20:00:59 +05:30
Arvind Tiwari 43ceea948e merged master 2017-08-30 19:38:19 +05:30
Arvind Tiwari 591c51bb46 translation fix 2017-08-29 17:57:11 +05:30
Arvind Tiwari 42a4c319a3 Merge branch 'master' into task/3703/hosting_dashboard 2017-08-29 17:52:06 +05:30
Arvind Tiwari 58e7a2aca7 saving cardholder name 2017-08-29 17:48:41 +05:30
Arvind Tiwari 32ba9c5ff7 Merge branch 'master' into task/3704/my_settings 2017-08-29 17:42:40 +05:30
Arvind Tiwari ce1d346bc1 billing form in settings page 2017-08-29 17:42:35 +05:30
Arvind Tiwari 49cc441fa0 style changes 2017-08-29 14:53:03 +05:30
PCoder 2ed07e25ff Corrected translation for 'You are not making payment ...' 2017-08-25 09:49:55 +05:30
Arvind Tiwari 23bf602a16 merged master, fixed translation 2017-08-24 20:16:26 +05:30
M.Ravi 5e26d6df04 Simplified text -> You are not making payment + translation 2017-08-24 13:18:59 +02:00