Commit Graph

647 Commits

Author SHA1 Message Date
Arvind Tiwari 4fd761c396 removed unused classes from datacenterlight css files 2018-01-10 02:47:25 +05:30
PCoder b0993d8728 Fix address: Bahnhotstrasse to Bahnhofstrasse 2017-12-27 23:44:27 +01:00
PCoder 4dff4e07cb Change minimum required RAM from 2GB to 1GB 2017-12-21 01:25:52 +01:00
Arvind Tiwari 8d64915d71 invoice footer added 2017-12-11 00:47:55 +05:30
PCoder f9bd849333 Remove redundant "previous" text 2017-10-31 09:05:49 +01:00
PCoder 62f30bf03c Remove some commented and unnecessary code 2017-10-29 22:03:19 +01:00
PCoder bafb4e7b68 Remove hasCreditcard js code - not used anymore 2017-10-28 23:42:30 +02:00
PCoder db8dd9af54 Hosting payment: select card text update 2017-10-28 23:18:10 +02:00
PCoder c47b5cdc72 Add form to send selected card in settings page 2017-10-28 22:17:46 +02:00
PCoder 175180e193 Show DEFAULT text against the default card in the settings page 2017-10-28 20:45:00 +02:00
PCoder de5035d12e Add id_card input element 2017-10-22 00:21:08 +02:00
PCoder bf91bf3822 Change text: delete card to remove card 2017-10-21 23:14:05 +02:00
PCoder 7f4993c3f0 Update hosting payment template to use added cards 2017-10-21 23:12:53 +02:00
PCoder be8181ec42 Add _messages template to hosting/settings.html 2017-10-21 17:02:24 +02:00
M.Ravi 60cfc24319 Merge branch task/3766/credit_card_options from tiwariav into task/3747/multiple_cards_support 2017-10-19 20:24:28 +02:00
Arvind Tiwari 2a71be354b conflicts resolved 2017-10-17 00:27:50 +05:30
M.Ravi de275c23ac Add modal for card delete 2017-10-16 16:18:17 +02:00
M.Ravi 52791f5e48 Refactor cc_brand to brand 2017-10-15 23:56:38 +02:00
M.Ravi f71c8e553d Add name to user details form button name 2017-10-15 19:54:01 +02:00
M.Ravi 1a25bbf11e Add name to card form button name 2017-10-15 19:51:58 +02:00
M.Ravi e6f92d9ae4 Manual merge 2017-10-15 16:14:33 +02:00
Arvind Tiwari 3370f06bff msg fix 2017-10-15 02:30:42 +05:30
Arvind Tiwari c60d45c292 merge master 2017-10-15 01:52:29 +05:30
Arvind Tiwari 1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
2017-10-15 01:27:02 +05:30
Arvind Tiwari ed1f1451ce [] removed around the vm name 2017-10-15 00:41:31 +05:30
Arvind Tiwari 2cd1850f02 password reset email fix 2017-10-15 00:30:52 +05:30
Arvind Tiwari 7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
Arvind Tiwari 25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
Arvind Tiwari f3832c1db9 content-dashboard removed for unregistered pages 2017-10-07 17:06:55 +05:30
Arvind Tiwari 7d7b8661ea translations 2017-10-07 16:19:53 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 88781e992c 24 hr fix 2017-10-06 04:20:38 +05:30
Arvind Tiwari d3d57ade37 formats fixed 2017-10-06 04:16:58 +05:30
Arvind Tiwari 8e5654bdb5 date time converted to locale 2017-10-06 04:11:40 +05:30
Arvind Tiwari 4dbf08f995 Merge branch 'master' into task/3828/invoice_period 2017-10-06 02:39:07 +05:30
Arvind Tiwari ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari bd3c59eb3e card_input template 2017-10-06 01:17:50 +05:30
Arvind Tiwari 6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
Arvind Tiwari 5e8b34d39c Update hosting favicon to dcl favicon 2017-10-06 01:02:14 +05:30
Arvind Tiwari fc68715bcb Merge pull request #507 from tiwariav/task/3811/create_vm_page_text
task/3811 create vm page lead text added
2017-10-04 01:00:03 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari 0ba6bca06b Merge pull request #508 from tiwariav/task/3823/hosting_favicon
task/3823 hosting favicon link fixed
2017-10-03 23:42:57 +05:30
Arvind Tiwari 96d8f8358f Merge pull request #512 from tiwariav/bugfix/card_input
Bugfix/hosting_card_input
2017-10-03 21:39:44 +05:30
Arvind Tiwari bfbf4d87cc Merge pull request #503 from tiwariav/task/3785/my_bills_page
Task/3785 update my bills page
2017-10-03 21:31:27 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari 734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 22af001489 Merge upstream master 2017-10-02 00:09:38 +02:00
M.Ravi cf45a9ac75 Add messages to some hosting templates 2017-10-01 20:39:55 +02:00
M.Ravi 9e8d930a3b Refactor messages to includes/_messages.html 2017-10-01 20:16:05 +02:00
Arvind Tiwari bd91883369 end_date added 2017-09-30 17:55:49 +05:30
Arvind Tiwari 1fb7511292 favicon link changed 2017-09-30 17:08:40 +05:30
Arvind Tiwari c6173ed2e6 lead text added 2017-09-30 16:53:44 +05:30
M.Ravi 43e6fc45e2 Add de translations 2017-09-29 22:19:26 +02:00
Arvind Tiwari 7bd61f708c Merge branch 'master' into task/3785/my_bills_page 2017-09-28 18:38:49 +05:30
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
Arvind Tiwari b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
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
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
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 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
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 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 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
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 f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
Arvind Tiwari 1fdc533f4d bills list page updated 2017-09-26 01:18:39 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +05:30
PCoder 46d82268f4 Show terminated in invoice for VM that has been terminated 2017-09-25 02:04:40 +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 09dc0cde13 Removed unwanted js code that was causing error 2017-09-24 04:39:00 +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 7456baac16 merged master 2017-09-23 23:05:10 +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 e9721705ca margin fix 2017-09-23 20:30:53 +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 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 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
Arvind Tiwari dd77f40707 top options added 2017-09-21 02:23:08 +05:30
Arvind Tiwari 98eb2f85d8 printing pdf 2017-09-21 01:19:38 +05:30
Arvind Tiwari 65618bb2aa merged master 2017-09-20 23:24:20 +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 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 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 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 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 87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
Arvind Tiwari 0c3f605735 status pending style in vm-list 2017-09-15 17:02:02 +05:30
PCoder 589a4fcaa9 Added create vm modal 2017-09-15 12:45:11 +05:30
Arvind Tiwari 75156d2c00 undo changes in navbar 2017-09-15 01:00:07 +05:30
Arvind Tiwari c2b5c62014 hosting calculator added 2017-09-15 00:49:39 +05:30
Arvind Tiwari 8ca1b13f80 template fixed 2017-09-14 02:29:51 +05:30
Arvind Tiwari 07a464231d animation added to vm termination 2017-09-14 02:24:10 +05:30
PCoder 8c3544c0a4 Formatted code and added text - ending in 2017-09-13 00:01:10 +05:30
PCoder c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
M.Ravi e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
2017-09-09 13:27:17 +02:00
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari e9e72f4883 hosting navbar logo link fixed to dcl landing 2017-09-09 00:46:13 +05:30
Arvind Tiwari 3852d26f37 merged master 2017-09-08 20:13:17 +05:30
Arvind Tiwari fc170462e2 font weight on mobile 2017-09-08 03:41:25 +05:30
Arvind Tiwari 3b8c3265ca Merge pull request #484 from tiwariav/task/3779/transparent_navbar
Task/3779 transparent navbar on signup-validate pages
2017-09-08 02:57:10 +05:30
Arvind Tiwari 6a56f4c689 logo position fix 2017-09-08 02:43:11 +05:30
Arvind Tiwari 9721784ff2 logo href fixed 2017-09-08 02:32:46 +05:30
Arvind Tiwari 73bbe29113 transparent navbar added to signup validate page 2017-09-07 22:47:56 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
M.Ravi df23862ea1 Added per month text for price 2017-09-06 23:49:38 +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
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 8ac8b25d78 Updated new vm email template 2017-09-04 12:32:53 +05:30
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 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 1c42623964 Fixed some password reset email translation issues 2017-09-02 16:24:25 +05:30
PCoder 7c70ee637a Updated password reset template 2017-09-02 15:56:17 +05:30
Arvind Tiwari b9f0a886e0 translation fixes 2017-09-02 03:09:02 +05:30
Arvind Tiwari 4b24c227ee Merge pull request #476 from tiwariav/bugfix/hosting_payment_navbar
bugfix/hosting datacenterlight payment template separated
2017-09-02 02:04:32 +05:30
Arvind Tiwari 979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari fa5bf56f73 Merge pull request #475 from tiwariav/bugfix/translation
Bugfix/translation
2017-09-02 01:50:29 +05:30
Arvind Tiwari 1426cba3a5 approved, declined translations added 2017-09-02 01:48:51 +05:30
Arvind Tiwari 4a3ab29bd5 minor fix 2017-09-02 00:14:12 +05:30
Arvind Tiwari 31552b886f btn styles fixed 2017-09-02 00:11:16 +05:30
Arvind Tiwari 79cf5e416c modal btn min width, modal width increased 2017-09-01 23:56:01 +05:30
Arvind Tiwari b622e53313 translation fix, master merged 2017-09-01 23:13:54 +05:30
Arvind Tiwari 3ed2399337 merge master 2017-09-01 00:39:01 +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 da41045b0f ssh key heading changed 'Your SSH Keys' -> 'My SSH Keys' 2017-08-31 20:02:20 +05:30
Arvind Tiwari 9bcd064aae btn text changed 'View Details' -> 'View Invoice' 2017-08-31 15:59:22 +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 f45ec16091 added options to card details 2017-08-30 19:35:23 +05:30
Arvind Tiwari 919ad6e869 email added to contact button 2017-08-29 18:01:00 +05:30
Arvind Tiwari 58e7a2aca7 saving cardholder name 2017-08-29 17:48:41 +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
Arvind Tiwari daa50d4672 settings page design 2017-08-24 22:11:15 +05:30
Arvind Tiwari 9be42f3fd4 links added to the boxes 2017-08-24 20:36:00 +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 60df9a888c Added translation for month 2017-08-24 12:48:30 +02:00
PCoder ebff2cbd94 hosting/payment.html: Added /month text and adjusted width 2017-08-24 12:55:22 +05:30
Pcoder 0026874f09 Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages
Corrected/added missing google analytics and reformated code
2017-08-24 00:00:22 +02:00
PCoder 703644ced4 Removed orphaned alt tag 2017-08-24 03:17:39 +05:30
Arvind Tiwari 30551e5ac5 merged master 2017-08-24 00:59:17 +05:30
Arvind Tiwari 4cf6df64a8 btn link fixed 2017-08-23 23:59:18 +05:30
Arvind Tiwari 788621bd2b test markup removed 2017-08-23 23:07:40 +05:30
Arvind Tiwari e50baf50e8 increased padding 2017-08-23 21:51:56 +05:30
Arvind Tiwari 0cac35831a code cleanup, translations fix 2017-08-23 19:22:59 +05:30
Arvind Tiwari 12844ac0d9 dashboard page 2017-08-22 21:35:30 +05:30