Commit graph

2641 commits

Author SHA1 Message Date
Arvind Tiwari 223606947a removed icon 2017-09-07 23:48:53 +05:30
Arvind Tiwari c8b0e2388d login btn special style reset 2017-09-07 23:10:05 +05:30
Arvind Tiwari 73bbe29113 transparent navbar added to signup validate page 2017-09-07 22:47:56 +05:30
Arvind Tiwari ac2791a3f1 dcl navbar border dadded 2017-09-07 22:44:06 +05:30
Arvind Tiwari 3dca3a40ae Merge pull request #464 from tiwariav/task/3704/my_settings
Task/3704 my settings page
2017-09-07 22:36:09 +05:30
Arvind Tiwari e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard 2017-09-07 22:24:03 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
Arvind Tiwari 43c6abea7e minor changes 2017-09-07 20:27:18 +05:30
Arvind Tiwari d643e6a5b1 login btn on datacenterlight pages 2017-09-07 20:24:19 +05:30
Arvind Tiwari a0451fc8ea Merge remote-tracking branch 'ungleich/master' 2017-09-07 19:59:36 +05:30
M.Ravi ec300a76eb Handled some more errors that can be generated when creating SSHKey 2017-09-07 00:44:53 +02:00
M.Ravi cf6bd8a7c1 Validating ssh public keys using sshpubkeys 2017-09-07 00:31:15 +02:00
M.Ravi 0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
M.Ravi 67ab4ef0a1 hosting: Added order-confirmation url 2017-09-06 23:50:19 +02:00
M.Ravi df23862ea1 Added per month text for price 2017-09-06 23:49:38 +02:00
M.Ravi 367be351a2 Merged upstream origin 2017-09-06 23:03:53 +02:00
M.Ravi 7c87b520c1 Updated Changelog for 1.2.1 2017-09-06 22:58:44 +02:00
Pcoder 4b2b88fc27 Merge pull request #479 from pcoder/task/3757-2/dcl_add_new_routes
Added /l route to datacenterlight
2017-09-06 20:51:14 +00:00
M.Ravi 4925146715 Using one lettered url patterns for social media links 2017-09-06 22:05:52 +02:00
M.Ravi c072d382ee Added /fb and /li routes to datacenterlight 2017-09-06 20:13:30 +02:00
PCoder 2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30
Arvind Tiwari d13d9bf441 removed edit option from card details 2017-09-05 22:09:18 +05:30
PCoder dc6fa5428e Corrected filtering public ssh keys condition 2017-09-05 03:29:12 +05:30
PCoder a32bb9b774 We use the default timezone available to celery 2017-09-05 02:26:00 +05:30
Arvind Tiwari 5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
PCoder 277fcdbac1 cdist: Updated requirements.txt 2017-09-05 00:34:22 +05:30
Arvind Tiwari 3ff0c4a1a2 merged master 2017-09-04 23:52:22 +05:30
Arvind Tiwari 0bdda9a542 Merge remote-tracking branch 'ungleich/master' 2017-09-04 23:43:58 +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 a98832c6d3 Fixed datacenterlight django.po 2017-09-03 18:49:28 +02:00
M.Ravi 7a4e0760ae Updated account activation txt email template 2017-09-03 18:47:42 +02:00
M.Ravi d481737518 Fixed subject of account activation email templates 2017-09-03 18:17:25 +02:00
M.Ravi f7129e0b23 Removed an invalid quote from cancel email template 2017-09-03 17:49:31 +02:00
M.Ravi 52edb5466d Added some translations in utils django.po 2017-09-03 17:22:16 +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 a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
M.Ravi 0d4c40cfa2 Fixed missing trans tag in _footer.html 2017-09-03 12:44:42 +02:00
PCoder f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi 8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi 50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder 3a739f1cde Added utils django.po 2017-09-02 17:23:10 +05:30
PCoder 3b444b38b1 Regenerated dcl django.po 2017-09-02 16:53:49 +05:30
PCoder 7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
PCoder 2276533185 Reformatted utils/views.py and added a condition to DCL_TEXT in passoword reset email 2017-09-02 16:36:27 +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