Commit Graph

147 Commits

Author SHA1 Message Date
Arvind Tiwari ce63d397be Merge pull request #504 from tiwariav/task/3812/modal_weight_fix
Task/3812 modal font size and check icon weight fix
2017-09-27 00:42:37 +05:30
Arvind Tiwari 6ef5d2f777 typo fix 2017-09-27 00:08:14 +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
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 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 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 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 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
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