mravi
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,122 Commits 59 Branches 86 Tags 315 MiB
Commit Graph

962 Commits

Author SHA1 Message Date
Arvind Tiwari 88706b0088 merged master 2017-09-28 03:06:47 +05:30
Arvind Tiwari 4379cebbed default 'card' translated 2017-09-28 03:05:47 +05:30
Pcoder e0c9764e4e Merge pull request #505 from tiwariav/bugfix/order_details 
Bugfix/ order details page
 2017-09-27 21:26:36 +00:00
Arvind Tiwari 3ba1f191a3 show period if dates exist 2017-09-28 02:47:58 +05:30
Arvind Tiwari df67fa3333 period added 2017-09-28 02:39:55 +05:30
PCoder 4e080c9afc Invoice: Get VM name from id and configuration 2017-09-28 02:36:49 +05:30
Arvind Tiwari 858fdd5e3f Update order_detail.html 2017-09-28 02:11:11 +05:30
Arvind Tiwari 7039ccd3b9 modal btn color changed 2017-09-28 02:09:03 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
PCoder 3bc82907a9 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-28 01:14:37 +05:30
Arvind Tiwari 7a07785a94 vm cancel email subject changed 2017-09-28 01:11:39 +05:30
Arvind Tiwari 8b9935f677 padding fix 2017-09-28 00:59:49 +05:30
Arvind Tiwari 77b2684217 mobile alignment fix for btn 2017-09-28 00:50:38 +05:30
Arvind Tiwari 4194a7c2d7 table header fixed 2017-09-27 22:50:42 +05:30
M.Ravi 13556ef672 Merge branch 'master' into task/3672/cleaning_existing_tests 2017-09-27 14:18:14 +02:00
Arvind Tiwari 11c1781839 fix for gmail autoformatiing 2017-09-27 04:37:02 +05:30
Arvind Tiwari 313b32e098 vm name bold in email 2017-09-27 04:24:22 +05:30
Arvind Tiwari 06bc37a977 paddings changed 2017-09-27 04:13:04 +05:30
Arvind Tiwari 937cd2cd82 minor fix 2017-09-27 03:41:18 +05:30
Arvind Tiwari 45df525a37 vm cancel name fix 2017-09-27 03:38:39 +05:30
Arvind Tiwari f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari 5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari 2d06173edb logo padding 2017-09-27 02:50:59 +05:30
Arvind Tiwari d888b260ee welcome user mail 2017-09-27 02:45:24 +05:30
Arvind Tiwari 8307636b9b Merge branch 'master' into task/3794/update_email_styles 2017-09-27 02:16:09 +05:30
Arvind Tiwari d3f2fd2aa0 dcl logo changed to png 2017-09-27 02:14:20 +05:30
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
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
Arvind Tiwari 42985c28f1 using data.redirect to set redirect path on success 2017-09-26 22:58:56 +05:30
PCoder e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
Arvind Tiwari 2dbaa1c693 template name 2017-09-26 03:57:07 +05:30
Arvind Tiwari 2a99d053dc text fixes 2017-09-26 03:42:10 +05:30
Arvind Tiwari 3cf28c793c form method fix 2017-09-26 03:29:38 +05:30
Arvind Tiwari 3c32abbf8e dcl form added 2017-09-26 03:18:19 +05:30
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
Arvind Tiwari f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
PCoder 3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
Arvind Tiwari 1fdc533f4d bills list page updated 2017-09-26 01:18:39 +05:30
PCoder 81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
Arvind Tiwari 230866e563 Merge branch 'master' into task/3808/dcl_order_confirm 2017-09-26 01:10:16 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +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 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
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 46d82268f4 Show terminated in invoice for VM that has been terminated 2017-09-25 02:04:40 +05:30
PCoder 7fcece40c1 Using VMDetail model to show order details 2017-09-25 01:49:00 +05:30
PCoder f2213305f6 Reformatted hosting views.py 2017-09-25 00:46:39 +05:30
PCoder 83ccb9cffa Added vmdetail migration file 2017-09-25 00:36:33 +05:30
PCoder f2f2fc22df Update VMDetail's terminated_at on delete of a vm 2017-09-25 00:30:28 +05:30
PCoder f4899ffc18 Added missing get_language import 2017-09-25 00:01:48 +05:30
PCoder a45679d89a Added VMDetail model 2017-09-25 00:00:45 +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 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
M.Ravi 0974376e9f Reformatted code 2017-09-24 09:34:30 +02:00
PCoder 09dc0cde13 Removed unwanted js code that was causing error 2017-09-24 04:39:00 +05:30
PCoder 39a2455817 Merged upstream master into task/3730/refactor_price_parameter 2017-09-24 04:20:41 +05:30
PCoder 9491bb81a2 Added missing import after merge 2017-09-24 02:03:48 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder 300997699a Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm 2017-09-24 01:08:15 +05:30
Arvind Tiwari 313b2b2f57 fixed vreate vm error 2017-09-23 23:47:25 +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
PCoder 83b52d95ae Merge branch 'master' into task/3730/refactor_price_parameter 2017-09-23 21:18:54 +05:30
Arvind Tiwari e9721705ca margin fix 2017-09-23 20:30:53 +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
PCoder 99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions 2017-09-23 03:18:05 +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 6004a7ede4 new welcome email 2017-09-23 01:03:43 +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
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
Arvind Tiwari 6c381dd3fb invoice page redesigned 2017-09-21 15:03:00 +05:30
Arvind Tiwari 6dfbf67d7d rearranging text 2017-09-21 02:50:07 +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
Arvind Tiwari 1eff51099c exception handling fix 2017-09-21 02:26:42 +05:30
Arvind Tiwari dd77f40707 top options added 2017-09-21 02:23:08 +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 f0e50a4e94 removed commented code 2017-09-21 01:20:51 +05:30
Arvind Tiwari 98eb2f85d8 printing pdf 2017-09-21 01:19:38 +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 f4766c7d7c merged master 2017-09-20 23:19:32 +05:30
Arvind Tiwari 37017dd31a minor mods 2017-09-20 23:06:51 +05:30
Arvind Tiwari 98f094e5b8 initial changes 2017-09-19 15:03:06 +05:30
Arvind Tiwari 04126c69ee vm name added 2017-09-19 14:34:53 +05:30
Arvind Tiwari 445359e1ed modal restyle 2017-09-19 14:29:18 +05:30
Arvind Tiwari c53c966136 success modal modification 2017-09-19 14:24:23 +05:30
Arvind Tiwari 4787276afe bootstrap form input box-shadow removed 2017-09-19 13:54:27 +05:30
Arvind Tiwari e893f1baf1 padding fix 2017-09-19 01:17:15 +05:30
Arvind Tiwari 3ef07758ef translation and text fix 2017-09-19 01:08:27 +05:30
Arvind Tiwari 78423c83e3 removed error details from error msg 2017-09-19 00:59:51 +05:30
Arvind Tiwari 61bf158238 fix 2017-09-19 00:25:38 +05:30
Arvind Tiwari 8db7ead9e2 checking VM termination error 2017-09-19 00:24:06 +05:30
Arvind Tiwari 43300c7226 translations added, modal fixed 2017-09-18 23:21:04 +05:30
Arvind Tiwari 226f744bae success modal added 2017-09-18 21:52:59 +05:30
Arvind Tiwari b276194f31 width normalized 2017-09-18 20:18:02 +05:30
Arvind Tiwari 772469a23e design modifications 2017-09-18 19:49:14 +05:30
PCoder 3fe6e65e84 Rearranged hold tight text 2017-09-16 21:45:21 +05:30
PCoder 0cf8e237b5 Now passing user's language to celery task 2017-09-16 20:55:37 +05:30
PCoder acb739944b Added sending email to user on create vm 2017-09-16 19:30:31 +05:30
PCoder f2ee0ea657 Converting ugettext_lazy proxy to string 2017-09-16 17:54:05 +05:30
PCoder c9fd741c89 Added encode method for ugettext_lazy strings 2017-09-16 17:22:37 +05:30
PCoder 40f13784ac Reverted back to ugettext_lazy in hosting/views 2017-09-16 16:50:14 +05:30
PCoder 155a4b7cb6 Added translation and fa-times icon 2017-09-16 15:35:31 +05:30
M.Ravi fe12b9e688 Added simple error handling case 2017-09-15 18:32:11 +02:00
M.Ravi 67f0e9068d Fixed issue with multiline with template statement 2017-09-15 18:16:12 +02:00
M.Ravi aab9464c6f Rearranged order_detail.html 2017-09-15 18:11:22 +02:00
M.Ravi fa6901e679 Made create vm modal non responsive to escape key press 2017-09-15 17:55:35 +02:00
M.Ravi 8c2fd03082 Now responding json HttpResponse for modal on vm create in hosting. 
Important: Using ugettext instead of ugettext_lazy in hosting/views.py
 2017-09-15 17:34:23 +02:00
M.Ravi e14ed0c69f Added js handling of create vm form submission 2017-09-15 17:30:38 +02:00
M.Ravi ca5a99ccf5 Reverted autoformatted code 2017-09-15 17:29:41 +02:00
M.Ravi 445b8f4a79 Created virtual_machine_create_form and added ids for elements 2017-09-15 17:17:21 +02:00
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 87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
Arvind Tiwari d49e90bd20 catching WrongIdError 2017-09-15 18:15:06 +05:30
Arvind Tiwari 9c0cefd419 js polling timing to 5s 2017-09-15 17:44:27 +05:30
Arvind Tiwari bbb1919404 error msg fix 2017-09-15 17:38:52 +05:30
Arvind Tiwari 77f2454e3c remove error msg on successful termination 2017-09-15 17:20:42 +05:30
Arvind Tiwari 0c3f605735 status pending style in vm-list 2017-09-15 17:02:02 +05:30