Commit graph

2627 commits

Author SHA1 Message Date
PCoder
75ff7e4ea8 Added some translations 2017-09-26 01:53:19 +05:30
PCoder
81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder
25f3118126 Updated Changelog 2017-09-26 01:06:41 +05:30
Pcoder
ed4c968974 Merge pull request #501 from pcoder/bug/3806/cannot_create_vms_after_password_reset
Fix cannot create vms after password reset
2017-09-25 19:34:39 +00:00
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
c2844d25ed Corrected a de spelling 2017-09-26 00:06:17 +05:30
PCoder
78abc0c740 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-25 23:55:20 +05:30
PCoder
bb8c1a72fd Add missing import get_language 2017-09-25 23:52:47 +05:30
verysanghee
04c29d0622 Update django.po 2017-09-25 20:17:12 +02:00
M.Ravi
a73bcaef05 Store hash 2017-09-25 09:35:18 +02:00
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
84db1606a3 Added resend_activation_link.html template file 2017-09-24 18:04:11 +05:30
PCoder
24522908e0 Added resend activation link to login page 2017-09-24 16:02:06 +05:30
PCoder
3e32e5127b Added ResendActivationLinkViewMixin 2017-09-24 15:55:52 +05:30
PCoder
af426c5b7a Added ResendActivationEmailForm and translation function to untranslated texts 2017-09-24 15:54:45 +05:30
PCoder
3247616137 Added resend activation link url 2017-09-24 15:53:08 +05:30
PCoder
afc368e9dd Added ResendActivationEmailView 2017-09-24 15:52:17 +05:30
Arvind Tiwari
cd3fdcf935 Updated pre-changelog 1.2.3 2017-09-23 23:33:48 +05:30
Arvind Tiwari
ae1a317bf9 Merge pull request #486 from tiwariav/task/3728/vm_teminate_animation
task/3728 vm termination animation
2017-09-23 23:26:00 +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
487af6e1c8 Update Changelog 2017-09-23 20:44:53 +05:30
Arvind Tiwari
61a1486ea4 Merge pull request #497 from tiwariav/bugfix/hosting_invoice_page
bugfix/hosting_invoice_page
2017-09-23 20:33:05 +05:30
Arvind Tiwari
e9721705ca margin fix 2017-09-23 20:30:53 +05:30
Arvind Tiwari
2385c108e1 Merge pull request #491 from tiwariav/task/3786/hosting_invoice_page
Task/3786 order-details/invoice page redesign
2017-09-23 20:07:05 +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
PCoder
dec1f34250 Updated Changelog with pre-1.2.3 text 2017-09-23 17:17:24 +05:30
Pcoder
1b7da239e1 Merge pull request #492 from pcoder/feature/cms_prefix
Added /cms prefix for all the django-cms generated urls
2017-09-23 11:40:39 +00:00
M.Ravi
faa26a05dd Reverted back some lines for preserving format 2017-09-22 08:51:35 +02:00
M.Ravi
2b0dbfa1e5 Added /cms prefix to django-cms urls 2017-09-22 08:47:42 +02:00
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
Arvind Tiwari
a16dbb50d8 design fixes 2017-09-21 19:17:10 +05:30
Arvind Tiwari
db3955ab94 error 500 fixed 2017-09-21 17:45:12 +05:30
Arvind Tiwari
a792911dea hosting view fix 2017-09-21 17:22:02 +05:30
Arvind Tiwari
5d8fb71215 removed redirects form get_context() to get() 2017-09-21 16:38:54 +05:30
Arvind Tiwari
2c4390767d minor fixes 2017-09-21 15:14:15 +05:30