Commit graph

534 commits

Author SHA1 Message Date
Arvind Tiwari
377f82319d buttons made to work 2017-08-19 02:21:34 +05:30
Arvind Tiwari
752e5f53d8 translations 2017-08-19 00:02:12 +05:30
Arvind Tiwari
3dc41edefb mobile border glitch solved 2017-08-18 23:51:27 +05:30
Arvind Tiwari
5e5e33ce70 alignment and last item border 2017-08-18 23:27:57 +05:30
PCoder
35736ae593 Refactored some code 2017-08-18 01:49:27 +05:30
PCoder
fc70c30f21 Merged master into task/3701/enable_monthly_payments 2017-08-18 00:40:57 +05:30
Pcoder
a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
M.Ravi
3445579a8e Added 0042_hostingorder_subscription_id.py migration file 2017-08-17 18:36:14 +02:00
M.Ravi
ecbbe1eb6d Added subscription_id field and reformatted the code 2017-08-17 18:16:36 +02:00
Arvind Tiwari
1547b725d0 new vm_details page 2017-08-17 02:48:35 +05:30
Arvind Tiwari
b09477c874 text changed Ipv -> IPv 2017-08-16 20:41:55 +05:30
Arvind Tiwari
079f0ed68d status text capitalization changed to Titlecaps 2017-08-16 20:35:14 +05:30
Arvind Tiwari
a2229d3250 created translations 2017-08-16 04:26:17 +05:30
Arvind Tiwari
df97a16a26 removed old markup 2017-08-16 04:14:46 +05:30
Arvind Tiwari
337021a470 added other conditional components on page 2017-08-16 04:13:40 +05:30
Arvind Tiwari
8160e53ea7 removed commented html 2017-08-16 04:10:08 +05:30
Arvind Tiwari
aec4073af5 removed testing markup from html 2017-08-16 04:08:44 +05:30
Arvind Tiwari
e92e3a9527 new design for page /my-virtual-machines 2017-08-16 04:02:22 +05:30
Arvind Tiwari
7825114f5e Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer
bugfix/3683 footer fix on hosting
2017-08-12 01:28:31 +05:30
ARvind Tiwari
07f92e754e fix for mobile 2017-08-12 01:18:14 +05:30
ARvind Tiwari
f8ce8f975f footer fix on hosting 2017-08-12 00:49:20 +05:30
Arvind Tiwari
fcc8c4718c Merge pull request #444 from tiwariav/bug/3677/ssh-key-modal
bugfix/3677 ssh modal key wrapping
2017-08-12 00:42:59 +05:30
Arvind Tiwari
4ab26b4bbd Merge pull request #440 from tiwariav/task/3619/lato-font
Task/3619 Lato font used in all stylesheets
2017-08-12 00:42:37 +05:30
Arvind Tiwari
415c914982 Merge pull request #439 from pcoder/task/3655/check_authorization_delete_ssh_keys
Task/3655/Check authorization for delete ssh keys
2017-08-12 00:42:08 +05:30
ARvind Tiwari
3ccbf3a3ac ssh modal key word-break fixed so that it wraps 2017-08-11 01:49:41 +05:30
ARvind Tiwari
789946ff77 conditions for adjusting padding fixed 2017-08-09 01:32:41 +05:30
ARvind Tiwari
7bde3149f5 adjust padding on fixed .topnav on modal show/hide, to remove the movement 2017-08-09 01:26:02 +05:30
ARvind Tiwari
7cf46ad8b8 override bootstrap default danger color #a94442 -> #eb4d5c 2017-08-09 00:21:25 +05:30
ARvind Tiwari
ac0787bdd5 modal title font-weight and capitalization fix 2017-08-08 23:01:19 +05:30
Pcoder
34a95f5a05 Merge pull request #433 from pcoder/bug/3638/ssh_key_without_download_option
Bug/3638/ssh key without download option
2017-08-08 00:20:47 +02:00
ARvind Tiwari
cc58c49457 font-weight fix in hosting app 2017-08-08 00:51:54 +05:30
ARvind Tiwari
6c4e0067ba font-family changed to 'Lato' in all css files 2017-08-08 00:35:58 +05:30
Siarhei Puhach
72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach
a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00
Siarhei Puhach
4fea099b5d Changed invalid credit card error style 2017-08-07 10:05:12 +03:00
Siarhei Puhach
4de04b2663 Changed visa card error placement 2017-08-07 09:56:57 +03:00
M.Ravi
55177646b4 Reformatted code 2017-08-06 16:33:37 +02:00
PCoder
1d4f86da14 Added translation for Delete SSH Key 2017-08-05 00:01:19 +05:30
PCoder
7d334fddb0 Merge branch 'bugfix/modal_icons' of https://github.com/tiwariav/dynamicweb into tiwariav-bugfix/modal_icons 2017-08-04 23:53:47 +05:30
Pcoder
c1ad5e0b30 Merge pull request #422 from tiwariav/bugfix/3621/mobile_signup
bugfix #3621 signup page layout fix mobile, confirm-reset-page layout fix
2017-08-04 19:59:00 +02:00
M.Ravi
d85afd56e0 Fixed an issue
- Changed owner -> user
   - Reformatted code
2017-08-04 17:49:55 +02:00
PCoder
c6b23f6aa0 Added get_object method to verify if the user is the owner of the ssh key 2017-08-04 20:54:28 +05:30
Siarhei Puhach
fd2bc6e5cf Merge branch 'feature/task3637' of https://github.com/siarheipuhach/dynamicweb into feature/task3637 2017-08-04 12:40:14 +03:00
Siarhei Puhach
8769c4cd1f Changed payment error message style 2017-08-04 12:38:24 +03:00
Siarhei Puhach
657e97fc6d Merge branch 'master' into feature/task3637 2017-08-04 11:05:37 +03:00
Siarhei Puhach
29fb771afb Changed payment error place, changed message source to Stripe errors handler 2017-08-04 11:01:32 +03:00
PCoder
94bc552f75 Resolved conflicts 2017-08-04 03:25:47 +05:30
Pcoder
5b8e73984e Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix
Bug/3623/hosting my orders header fix
2017-08-03 23:38:22 +02:00
ARvind Tiwari
9f67af0739 modal icons fixed 2017-08-04 02:54:34 +05:30
PCoder
6175cf9617 Merge branch 'master' into bug/3638/ssh_key_without_download_option 2017-08-04 02:29:20 +05:30
Pcoder
3d051aee14 Merge pull request #428 from tiwariav/task/3620/ssh_keys
task/3620 ssh_keys_choice page new design
2017-08-03 22:53:12 +02:00
PCoder
23b927f7fb Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option 2017-08-04 02:07:25 +05:30
ARvind Tiwari
3560eede37 ssh list modal and table paddings 2017-08-04 02:05:27 +05:30
PCoder
0fa4c0ac94 Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option 2017-08-04 01:45:55 +05:30
Pcoder
0adc24c13a Merge pull request #423 from tiwariav/bugfix/3408/login_image
new background image for login/signup
2017-08-03 21:45:08 +02:00
ARvind Tiwari
75afb59d77 flex removed from dash-borad content, reset-password message added to login page 2017-08-04 00:28:15 +05:30
Pcoder
957c677e67 Merge pull request #427 from pcoder/bug/3627/outline_box
bug/3627/Add missing outline border around the text
2017-08-03 20:36:00 +02:00
ARvind Tiwari
6d2a6b6045 removed unused img file 2017-08-03 23:52:46 +05:30
ARvind Tiwari
87dc273c4b bootstrap file changed to default 2017-08-03 23:27:42 +05:30
ARvind Tiwari
a86224f566 translation fix 2017-08-03 23:26:09 +05:30
ARvind Tiwari
0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
M.Ravi
60d107baee Improved the condition about when to generate ssh keys 2017-08-03 15:07:36 +02:00
Siarhei Puhach
34acf2310b Added stripe failed payment error handler 2017-08-03 12:47:34 +03:00
ARvind Tiwari
3081786f0b merged master, conflict resolved 2017-08-03 03:27:46 +05:30
ARvind Tiwari
bbdea342cf merged master, conflict resolved 2017-08-03 03:20:59 +05:30
ARvind Tiwari
bfd621e98b ssh_keys table updated 2017-08-03 01:27:29 +05:30
ARvind Tiwari
00ec5fb0db code reformating 2017-08-03 00:59:05 +05:30
ARvind Tiwari
c8cf0bfba5 btn color on ssh_keys page 2017-08-03 00:50:27 +05:30
ARvind Tiwari
94e7039d8c btn color fix 2017-08-03 00:24:27 +05:30
ARvind Tiwari
f4876c162f btn color inverse 2017-08-03 00:22:25 +05:30
ARvind Tiwari
4bd34b56d1 fixes for mobile 2017-08-03 00:20:20 +05:30
ARvind Tiwari
0a858f8aa7 btn syles copied to add key page 2017-08-02 23:51:44 +05:30
ARvind Tiwari
3772788ffe btn colors onversed 2017-08-01 21:20:42 +05:30
ARvind Tiwari
6e7ed2d159 fix for desktop 2017-08-01 20:02:52 +05:30
ARvind Tiwari
70fcf01add fix for mobile 2017-08-01 19:56:47 +05:30
ARvind Tiwari
fadfb4f97d fix for mobile 2017-08-01 19:55:27 +05:30
ARvind Tiwari
f530b879f7 new design for ssh_keys_choice page 2017-08-01 19:05:52 +05:30
PCoder
bf1e5c71de Changed Preise -> Preis for pricing 2017-08-01 00:02:35 +05:30
ARvind Tiwari
ede12cc624 Merge branch 'master' into bugfix/3621/mobile_signup 2017-07-31 20:47:27 +05:30
ARvind Tiwari
2f9920ca27 min width on modal btns 2017-07-31 20:46:57 +05:30
ARvind Tiwari
299e9146e0 removed unavailable css from head 2017-07-31 20:31:08 +05:30
ARvind Tiwari
8aac161196 Merge branch 'master' into task/3354/modal_restyling 2017-07-31 20:17:17 +05:30
ARvind Tiwari
a194bd7d37 btn btext 2017-07-31 19:58:30 +05:30
ARvind Tiwari
abcbab999a translation fixes 2017-07-31 19:50:31 +05:30
ARvind Tiwari
1087620ae8 more translations fixed 2017-07-31 19:43:15 +05:30
ARvind Tiwari
a2f705f012 Merge branch 'master' into feature/3517/ssh_keys 2017-07-31 18:50:07 +05:30
PCoder
1278b01bad Added the missing class to show the outline. Also added some margin to fit perfectly. 2017-07-31 02:05:28 +05:30
PCoder
5ca7fd201c Added trans tag to All rights reserved 2017-07-31 01:06:23 +05:30
PCoder
ec5ed6874b Added trans tag to All rights reserved 2017-07-31 01:04:45 +05:30
PCoder
9fffc4dfc4 Updated dcl .po, added DE translation for All rights reserved 2017-07-31 01:02:41 +05:30
M.Ravi
8ec692e51b Reformatted code 2017-07-30 18:03:16 +02:00
PCoder
4883294acf Added condition to show Confirm Order only when ordering a VM, and Invoice when order details page 2017-07-30 20:41:11 +05:30
ARvind Tiwari
c4ee89f6b8 translations fixed 2017-07-29 18:19:10 +05:30
Pcoder
abbb217848 Merge pull request #404 from amarynets/bugfix/warning_messages
Fix warning messages and deprecated url #3542
2017-07-28 22:26:32 +02:00
ARvind Tiwari
024e6b6a40 new background image for login/signup 2017-07-28 18:53:17 +05:30
ARvind Tiwari
a1191e14ac signup page layout fix mobile, confirm-reset-page layout fix 2017-07-28 18:27:38 +05:30
ARvind Tiwari
9bd9ec5971 merged master 2017-07-28 16:48:50 +05:30
ARvind Tiwari
925252f1c9 merged master 2017-07-28 16:45:34 +05:30
Arvind Tiwari
2724cbd375 merged from master 2017-07-28 16:43:03 +05:30
ARvind Tiwari
b0e6c5b55b style changes 2017-07-27 20:14:10 +05:30