mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2621 commits 59 branches 86 tags 315 MiB
Commit graph

402 commits

Author SHA1 Message Date
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
Arvind Tiwari
6890c82122 dashboard url, view,template and css added 2017-08-22 20:45:18 +05:30
Arvind Tiwari
653b3654b8 merged master 2017-08-20 22:04:48 +05:30
Arvind Tiwari
395fa371db my orders page redesigned 2017-08-20 21:40:17 +05:30
Arvind Tiwari
fb82ef6018 Merge pull request #450 from tiwariav/task/3695/vm_list_design 
task/3695 new design for hosting/my-virtual-machines
 2017-08-20 03:00:52 +05:30
Arvind Tiwari
a55170dcf2 copied tooltip position chaged to left from bottom 2017-08-19 02:40:54 +05:30
Arvind Tiwari
de481e8114 invoice link fixed 2017-08-19 02:32:37 +05:30
Arvind Tiwari
377f82319d buttons made to work 2017-08-19 02:21:34 +05:30
Arvind Tiwari
5e5e33ce70 alignment and last item border 2017-08-18 23:27: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
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
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
3ccbf3a3ac ssh modal key word-break fixed so that it wraps 2017-08-11 01:49:41 +05:30
ARvind Tiwari
ac0787bdd5 modal title font-weight and capitalization fix 2017-08-08 23:01:19 +05:30
ARvind Tiwari
5cea467deb master merged 2017-08-07 22:23:51 +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
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
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
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
ARvind Tiwari
3560eede37 ssh list modal and table paddings 2017-08-04 02:05:27 +05:30
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
0993d8c106 reviewed changes 2017-08-03 22:00:41 +05:30
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
a3d5c81530 navbar fixed on payment, order-success, order-confirmation 2017-08-03 02:35:44 +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
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
817e0b73eb removed navbar toggle btn for unregistered users 2017-08-01 20:54:42 +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
ARvind Tiwari
ede12cc624 Merge branch 'master' into bugfix/3621/mobile_signup 2017-07-31 20:47:27 +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
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
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
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
ARvind Tiwari
c6a3928638 decoding error fixed 2017-07-27 19:45:55 +05:30
ARvind Tiwari
c4dd366997 translation tags added 2017-07-27 19:07:40 +05:30
ARvind Tiwari
99788468d1 download btn icon added for mobile 2017-07-27 17:33:44 +05:30
ARvind Tiwari
8a9242d74d ssh key flow styles fixed 2017-07-27 17:21:22 +05:30
ARvind Tiwari
08155c379b Merge branch 'master' into task/3354/modal_restyling 2017-07-27 16:02:39 +05:30
ARvind Tiwari
4216d9911a add ssh key form input shadows removed 2017-07-26 16:45:49 +05:30
ARvind Tiwari
ee4ce1cf7d removed close button 2017-07-25 22:28:04 +05:30
ARvind Tiwari
c511ede2c7 removed collapse button from navbar on login/signup/reset-password 2017-07-25 19:12:28 +05:30
ARvind Tiwari
0e4a488dc1 footer links :hover :fpcus :active color changed to #ddd 2017-07-25 18:59:07 +05:30
ARvind Tiwari
3c5cd50a47 commented markup removed from navbar 2017-07-25 18:26:56 +05:30
ARvind Tiwari
eb1b3b6eb5 new transparent navbar include in login,signup,reset-password 2017-07-24 19:43:03 +05:30
ARvind Tiwari
918e13bf91 modal close button thinner, some icons changed, vertical alignment changed to middle 2017-07-24 18:52:23 +05:30
ARvind Tiwari
805d151eea vertical alignment middle for modal 2017-07-24 17:55:36 +05:30
PCoder
f4aec68bfd Added style to right align date in desktop view in Order Confirm page 2017-07-18 00:30:32 +05:30
PCoder
3f6250862b Changed text align left to the date in the order_detail.html both in dcl and hosting 2017-07-17 02:57:24 +05:30
PCoder
9bb4742607 Fixed overlapping issue of date and billing address in hosting order_detail.html 2017-07-17 02:53:23 +05:30
PCoder
f10b7c0017 Fixed responsive issue 2017-07-17 02:52:41 +05:30
PCoder
a746fe4af4 Removed inline style 2017-07-17 02:14:08 +05:30
PCoder
e481ff947d Added code for tranlating Enter your credit card number in payment.js 2017-07-16 23:55:29 +05:30
PCoder
72d057e678 Fixed issue with Total including VAT text 2017-07-16 23:46:42 +05:30
PCoder
25ab98d69f Modified credit card texts that needed translations 2017-07-16 22:36:00 +05:30
PCoder
6ba0841bfe Center aligned the cvv field 2017-07-16 22:07:18 +05:30
PCoder
c09947ef12 Added the titles of the input fields 2017-07-16 21:29:42 +05:30
PCoder
f4d3d53d0c Fixed some missing translations 2017-07-16 16:52:53 +05:30
PCoder
a87c0a89eb Refactored and formatted unused code in hosting's payment.html payment.js landing-page.css 2017-07-16 16:37:49 +05:30
PCoder
acaa791a37 Fixed MM/YY and CVV for mobile view 2017-07-16 15:50:15 +05:30
PCoder
ba72527f2f Added validations for credit card inputs. Made credit card holder's name default value empty in the model. 2017-07-16 15:23:18 +05:30
PCoder
2bd5702b09 Modified payment.html to include credit card number , cvv and year as separate Stripe elements 2017-07-16 03:38:48 +05:30
PCoder
d711b524e1 New layout for payment page 2017-07-15 19:39:51 +05:30
Andrii Marynets
c7feed6a73 Delete commented code 2017-07-13 23:50:11 +03:00
Andrii Marynets
a8be59d7a2 Add GA to all important apps 2017-07-13 22:53:15 +03:00
PCoder
4bdee73bd5 Some more text changes 2017-07-11 00:04:23 +05:30
PCoder
975b13bc69 Some more modifications to text 2017-07-10 23:02:30 +05:30
PCoder
5d40830296 Some more change in payment page text 2017-07-10 22:51:14 +05:30
PCoder
fb7df2fdfc Changed the 'Place Order' text in payment to Submit 2017-07-10 11:42:44 +05:30
PCoder
32aaab2099 Added DE translations for credit card text and cleaned up unwanted text in payment.html 2017-07-10 02:01:27 +05:30
Polycarp Okock
46859ffcbc Fixed missing border and alignment 2017-07-08 02:14:04 +03:00
Polycarp Okock
0da78502a5 Fixed second alignment issue 2017-07-08 01:44:52 +03:00
Polycarp Okock
37de810cc3 Fixed the alignment issue 2017-07-08 01:39:53 +03:00
Polycarp Okock
efd90f8ddd Removed the extra btn 2017-07-08 00:50:41 +03:00
Pcoder
153d83add2 Fixed typo you -> your 2017-07-08 01:20:36 +05:30
Pcoder
9f3ea02584 Added translate block for text 2017-07-08 01:14:02 +05:30
Polycarp Okock
e551ba911b Merge branch 'master' into master 2017-07-07 22:37:58 +03:00
Polycarp Okock
e90d0faa9e Fixing missing warning text and alignment 
Fixed the missing warning text and alignment for {% if credit_card_data.last4 %}
 2017-07-07 22:19:59 +03:00
PCoder
aaff4f048d Removed some unnecessary code 2017-07-07 23:25:38 +05:30
PCoder
79df35a765 Merge branch 'task/3354/modal_restyling' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3354/modal_restyling 2017-07-07 23:21:27 +05:30
Siarhei Puhach
1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
Siarhei Puhach
d2d96e9951 Added private_key field to UserHostingkey model, some html updates 2017-07-06 14:18:22 +03:00
Siarhei Puhach
8986aa6550 Added generation button with no field input required (generate ssh key name) 2017-07-06 11:47:12 +03:00
Siarhei Puhach
7cc70a95ac Added new page(Choice ssh key generate/upload), changed design of generate ssh form 2017-07-05 16:57:49 +03:00
siarheipuhach
f49d6b398f Changed ssh keys design(+ mobile ver.) 2017-07-05 08:41:50 +03:00
deaspo
86c4e7b408 Task: Improve credit card section - letting the user know that they're not making any payment there but on the next page 
Signed-off-by: deaspo <polycarpokock@live.com>
 2017-07-05 01:53:01 +03:00
Siarhei Puhach
b96d13772e SSH keys list template changed 2017-07-04 17:55:43 +03:00
Siarhei Puhach
de0bada84a SSH key change design init 2017-07-04 15:00:08 +03:00
Mondi Geetha
8aa7ffa2d3 Added Heading to Modals and styles 2017-07-04 00:56:49 +05:30
Mondi Geetha
49ae9adcb8 Added icons for modals 2017-07-03 22:34:39 +05:30
M.Ravi
430ddc4bcb Merge branch 'master' into siarheipuhach-feature/flake8 2017-07-01 15:56:22 +02:00
M.Ravi
c8cf166571 Merged code from siarheipuhach/dynamicweb 2017-07-01 15:18:44 +02:00
PCoder
f847302acd Fixed hosting template footer for unauthenticated case (direct payment + order confirmation) 2017-07-01 11:22:12 +05:30
PCoder
b502cb5da8 Fixed logo in payment/order confirmation page not redirecting to index issue 2017-07-01 04:29:11 +05:30
PCoder
e286fc8aaf Added OS configuration to the payment page 2017-07-01 02:10:30 +05:30
PCoder
0b0892a299 Added OS to the payment page 2017-07-01 01:59:24 +05:30
Siarhei Puhach
1f0bb9f72a Merge branch 'master' of https://github.com/siarheipuhach/dynamicweb 
Merge upsteam/master
 2017-06-30 10:03:44 +03:00
Pcoder
69fde64149 Added missing colon 2017-06-29 21:24:52 +02:00
Pcoder
b649bcd87e Fixed a typo 2017-06-29 21:24:04 +02:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
Levi Velázquez
8904a14961 Merge branch 'master' into feature/added_localtime 2017-06-23 00:31:23 -05:00
Levi
720270bac5 fixed firefox issue 2017-06-23 00:30:31 -05:00
M.Ravi
aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
M.Ravi
654d73e51d Add some de translations and invoice now called 'Confirm Order' 2017-06-23 02:33:59 +05:30
Levi
8c7687fe7c fixed issue error 500 2017-06-21 13:32:23 -05:00
Levi
de64744120 fixed issue on order view 2017-06-21 13:31:02 -05:00
Levi
1897f4b5f6 fixing date format 2017-06-21 13:28:53 -05:00