Commit Graph

337 Commits

Author SHA1 Message Date
Arvind Tiwari 2a71be354b conflicts resolved 2017-10-17 00:27:50 +05:30
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 606a687bc7 conflicts resolved 2017-10-13 02:08:28 +05:30
M.Ravi 859ccd54a6 Remove some more commented code and console logs 2017-10-12 19:06:26 +02:00
M.Ravi 1b14598cc9 Create Stripe elements only stripe key is defined 2017-10-12 00:43:55 +02:00
Arvind Tiwari 6cdca621b2 original pattern.jpg added 2017-10-07 23:35:13 +05:30
Arvind Tiwari 25e3980b20 pattern.jpg compressed 2017-10-07 23:33:08 +05:30
Arvind Tiwari c400fdb02e width adjusted 2017-10-07 23:17:57 +05:30
Arvind Tiwari 2dd2945ee9 wider auth box 2017-10-07 17:51:18 +05:30
Arvind Tiwari d0003ce9f3 style fixes 2017-10-07 17:35:10 +05:30
Arvind Tiwari f3832c1db9 content-dashboard removed for unregistered pages 2017-10-07 17:06:55 +05:30
Arvind Tiwari 1dc374e09d footer links color changed 2017-10-07 16:23:04 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 8e5654bdb5 date time converted to locale 2017-10-06 04:11:40 +05:30
Arvind Tiwari ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari 7e380267b7 Update payment.css 2017-10-03 21:49:51 +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 e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 4ce1ff073a Some more modal styles 2017-09-28 23:31:29 +02:00
M.Ravi f60a2c3482 Make correct icons load on dcl createvm error modal 2017-09-28 23:20:43 +02:00
M.Ravi 9cab43f051 Update modal with html from server 2017-09-28 23:03:22 +02:00
PCoder 4efc1b4943 Merge branch 'master' into bugfix/stripe_error 2017-09-28 23:43:21 +05:30
M.Ravi 03442398c2 Handle message create vm request in js 2017-09-28 17:31:29 +02:00
Arvind Tiwari 9c69c4cb25 Update landing-page.css 2017-09-28 19:14:13 +05:30
Arvind Tiwari d751aa6d63 padding fix 2017-09-28 18:48:21 +05:30
Arvind Tiwari 7bd61f708c Merge branch 'master' into task/3785/my_bills_page 2017-09-28 18:38:49 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari 8b9935f677 padding fix 2017-09-28 00:59:49 +05:30
Arvind Tiwari 42985c28f1 using data.redirect to set redirect path on success 2017-09-26 22:58:56 +05:30
Arvind Tiwari f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +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 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 6c381dd3fb invoice page redesigned 2017-09-21 15:03:00 +05:30
Arvind Tiwari dd77f40707 top options added 2017-09-21 02:23:08 +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 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 445359e1ed modal restyle 2017-09-19 14:29:18 +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 78423c83e3 removed error details from error msg 2017-09-19 00:59:51 +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 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 e14ed0c69f Added js handling of create vm form submission 2017-09-15 17:30:38 +02:00
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 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
Arvind Tiwari fdb5039c02 minor adjustments 2017-09-15 16:57:17 +05:30
Arvind Tiwari 6136a48961 edge cases handled 2017-09-15 16:46:56 +05:30
Arvind Tiwari a935871722 code reformating 2017-09-15 00:57:59 +05:30
Arvind Tiwari c2b5c62014 hosting calculator added 2017-09-15 00:49:39 +05:30
Arvind Tiwari e045caebbe redirect on success 2017-09-14 02:52:37 +05:30
Arvind Tiwari 07a464231d animation added to vm termination 2017-09-14 02:24:10 +05:30
Arvind Tiwari 6237469ab2 mobile order fixed 2017-09-13 01:55:58 +05:30
Arvind Tiwari d4e73f4c74 Merge branch 'master' into task/3756/landing_billing_page 2017-09-09 02:13:24 +05:30
Arvind Tiwari 7a4573f7ad user logged in after signup on payment page 2017-09-09 02:10:25 +05:30
Arvind Tiwari daba6ae2fb merged master 2017-09-08 20:22:22 +05:30
Arvind Tiwari 3852d26f37 merged master 2017-09-08 20:13:17 +05:30
Arvind Tiwari 60bc1a86b3 font weight on mobile 2017-09-08 03:52:24 +05:30
Arvind Tiwari fc170462e2 font weight on mobile 2017-09-08 03:41:25 +05:30
Arvind Tiwari bbee940720 padding fix 2017-09-08 03:19:08 +05:30
Arvind Tiwari 4937baa2e0 dropdown style updated 2017-09-08 02:22:03 +05:30
Arvind Tiwari 84d35ea916 padding fixed 2017-09-08 00:11:20 +05:30
Arvind Tiwari b4641e9dfd font wieght 300 2017-09-08 00:07:09 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
Arvind Tiwari 0ed104cd56 logged in user 2017-09-07 19:56:34 +05:30
Arvind Tiwari 98e8be1da9 landing payment page layout complete 2017-09-07 02:47:57 +05:30
Arvind Tiwari aaf3bc18d8 landing_payment all sections arranged 2017-09-06 00:12:13 +05:30
Arvind Tiwari 5d3f355c36 no card added 2017-09-05 01:51:53 +05:30
Arvind Tiwari 09b80467b9 landing payment page cleanup 2017-09-05 00:24:18 +05:30
Arvind Tiwari 3ff0c4a1a2 merged master 2017-09-04 23:52:22 +05:30
Arvind Tiwari 5f384d430b Merge pull request #474 from tiwariav/task/3735/modal_btn_width
Task/3735 modal btn min-width, modal width increased
2017-09-02 00:32:08 +05:30
Arvind Tiwari 765432acbc minor fix 2017-09-02 00:17:01 +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 2fe3232d91 Merge branch 'master' into task/3704/my_settings 2017-09-01 23:14:32 +05:30
Arvind Tiwari b622e53313 translation fix, master merged 2017-09-01 23:13:54 +05:30
Arvind Tiwari 03a96f5457 Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
Task/3678 remove lato font files
2017-09-01 22:53:52 +05:30
Arvind Tiwari b1baf564db navbar-header clickable, contact href fixed, highlights focus color fixed 2017-09-01 02:05:24 +05:30
Arvind Tiwari 5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
Arvind Tiwari 3ed2399337 merge master 2017-09-01 00:39:01 +05:30