Commit graph

210 commits

Author SHA1 Message Date
Arvind Tiwari
050f750322 merged master 2017-09-26 03:06:12 +05:30
Arvind Tiwari
a37c734c94 translation fix 2017-09-26 02:53:09 +05:30
PCoder
81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder
6321f44c08 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-26 00:54:33 +05:30
PCoder
177c4719e1 Merge remote-tracking branch 'mainRepo/master' 2017-09-26 00:53:58 +05:30
verysanghee
f35663b5ac Update django.po 2017-09-25 21:18:46 +02:00
verysanghee
e85a7c9e2a Update django.po 2017-09-25 21:14:19 +02:00
verysanghee
2f4b7bb749 Update django.po 2017-09-25 21:07:33 +02:00
PCoder
f0ba9a0c0c Updated hosting django.po 2017-09-26 00:36:06 +05:30
PCoder
a9755ccbff Updated hosting django.po 2017-09-26 00:34:33 +05:30
verysanghee
889d737c7c Update django.po 2017-09-25 20:58:59 +02:00
PCoder
e2779314b0 Fix cancel vm modal text translation 2017-09-26 00:25:54 +05:30
PCoder
70d5efb21a Update hosting django.po with a de translation 2017-09-25 02:09:49 +05:30
PCoder
cd5607b44e Updated hosting django.po 2017-09-24 19:04:18 +05:30
PCoder
656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
Arvind Tiwari
7456baac16 merged master 2017-09-23 23:05:10 +05:30
Arvind Tiwari
eca7ba01c5 fixed duplicate translation 2017-09-23 22:54:17 +05:30
Arvind Tiwari
363017d85f Merge pull request #488 from tiwariav/task/3777/hosting_calculator
Task/3777 hosting create vm calculator
2017-09-23 22:50:25 +05:30
Arvind Tiwari
3685bf591d error msgs translation 2017-09-23 19:02:23 +05:30
Arvind Tiwari
be0c50aa2f error msgs translation 2017-09-23 19:01:22 +05:30
Arvind Tiwari
ec2413d3dc removed extra quote 2017-09-23 18:57:35 +05:30
Arvind Tiwari
6983b6f72e all emails redesigned 2017-09-23 02:27:19 +05:30
Arvind Tiwari
057a2c77a6 password reset email, user activation email redesigned 2017-09-23 01:57:40 +05:30
Arvind Tiwari
0993f2cab1 merged master 2017-09-21 19:43:20 +05:30
Arvind Tiwari
4a1596b093 merged master 2017-09-21 19:41:45 +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
143f40bd2d Merge branch 'task/3756/landing_billing_page' of https://github.com/tiwariav/dynamicweb into tiwariav-task/3756/landing_billing_page 2017-09-21 02:41:26 +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
Arvind Tiwari
0f5bf606da minor fixes 2017-09-20 23:32:48 +05:30
Arvind Tiwari
ec354332f8 translation fix 2017-09-20 23:28:36 +05:30
Arvind Tiwari
65618bb2aa merged master 2017-09-20 23:24:20 +05:30
Arvind Tiwari
fc03df4652 merged master 2017-09-20 23:21:24 +05:30
Arvind Tiwari
c53c966136 success modal modification 2017-09-19 14:24:23 +05:30
Arvind Tiwari
3ef07758ef translation and text fix 2017-09-19 01:08:27 +05:30
Arvind Tiwari
43300c7226 translations added, modal fixed 2017-09-18 23:21:04 +05:30
Arvind Tiwari
772469a23e design modifications 2017-09-18 19:49:14 +05:30
Arvind Tiwari
2de0fc13b9 translation fix 2017-09-15 20:17:54 +05:30
Arvind Tiwari
556ed75262 translations 2017-09-15 20:14:32 +05:30
Arvind Tiwari
8402fd4fd3 merge master 2017-09-15 00:19:01 +05:30
M.Ravi
bd45577c90 Removed unwanted translations in hosting django.po 2017-09-14 14:28:52 +02:00
Arvind Tiwari
8393afe141 translations and test methods removed 2017-09-14 02:59:08 +05:30
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
Arvind Tiwari
5f6f2e4ca9 added more translations 2017-09-11 23:52:30 +05:30
Arvind Tiwari
5d9a20dd94 merged master and added translations 2017-09-11 23:47:35 +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
Arvind Tiwari
de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
Arvind Tiwari
daba6ae2fb merged master 2017-09-08 20:22:22 +05:30
Arvind Tiwari
0ed104cd56 logged in user 2017-09-07 19:56:34 +05:30
M.Ravi
cf6bd8a7c1 Validating ssh public keys using sshpubkeys 2017-09-07 00:31:15 +02:00
Arvind Tiwari
db90ea8713 new translations 2017-09-07 02:51:07 +05:30
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
M.Ravi
f32494af2f hosting po file: Removed fuzzy for a text 2017-08-24 13:05:26 +02:00
Arvind Tiwari
738e4fc93f removed duplicate for "See Invoice" 2017-08-24 01:07:20 +05:30
Arvind Tiwari
30551e5ac5 merged master 2017-08-24 00:59:17 +05:30
Arvind Tiwari
04d7a2b076 removed fuzzy 2017-08-24 00:48:07 +05:30
Arvind Tiwari
f1f166b798 Ihre virtuelle Maschine beenden -> Deine Virtuelle Maschine beenden 2017-08-24 00:13:03 +05:30
Arvind Tiwari
e15cf7e164 translation fix 2017-08-23 19:35:23 +05:30
Arvind Tiwari
0cac35831a code cleanup, translations fix 2017-08-23 19:22:59 +05:30