Commit graph

437 commits

Author SHA1 Message Date
Arvind Tiwari
ba366eed77 merge master 2017-09-28 18:37:33 +05:30
PCoder
06ef940b01 Merge upstream 2017-09-28 03:33:43 +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
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
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
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