amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2035 commits 8 branches 146 tags 314 MiB
Commit graph

436 commits

Author SHA1 Message Date
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
69ff67c821 close icon fix 2017-07-25 22:21:39 +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
Andrii Marynets
3fc1cd9463 Fix url which will be deprecated in Django 1.10 2017-07-19 00:39:52 +03:00
PCoder
f4aec68bfd Added style to right align date in desktop view in Order Confirm page 2017-07-18 00:30:32 +05:30
PCoder
832ec48e93 Cleaned up some commented out code 2017-07-17 23:35:31 +05:30
PCoder
834810baf0 Added padding to enlarge the Submit payment button 2017-07-17 23:18:58 +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
7359703de8 Fixed responsive issue for tablet devices 2017-07-17 02:51:49 +05:30
PCoder
a746fe4af4 Removed inline style 2017-07-17 02:14:08 +05:30
PCoder
3edc426cc4 Using same styles for Card number, CVV and MM/YY 2017-07-17 02:13:27 +05:30
PCoder
56e8734a27 font-weight -> 300 and outline none to the submit button in payment page 2017-07-17 02:12:12 +05:30
PCoder
00f98de6fd deiner -> Deiner, deine -> Deine 2017-07-17 02:11:23 +05:30
PCoder
467bb8f114 Fixed a bug for Enter your credit card number text not showing up in german 2017-07-17 01:17:12 +05:30
PCoder
20a5414f61 Translated processing and Enter your credit card number 2017-07-17 01:06:24 +05:30
PCoder
d8fa3430e6 Removed box-shadow and set font-weight 400 in mobile view in the billing details 2017-07-17 00:33:48 +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
2bfc31e572 Added DE translations 2017-07-16 23:35:01 +05:30
PCoder
25ab98d69f Modified credit card texts that needed translations 2017-07-16 22:36:00 +05:30
PCoder
97acd76b51 Added card holders name for initialization 2017-07-16 22:33:52 +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
d0fb2c1f70 Updated hosting's .po 2017-07-16 16:42:49 +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
b67a12f01b Adjusted styles for error message 2017-07-16 16:04:15 +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
b64198c2c0 Added styles for the new credit card form 2017-07-16 03:41:54 +05:30
PCoder
73982f3c7b Updated DE translations for some reformatted EN texts 2017-07-16 03:41:20 +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
481dadcfe5 Implementing new credit card js code 2017-07-16 03:37:19 +05:30
PCoder
623c7e0d99 Added some padding to vat text and increased its font size 2017-07-15 20:44:28 +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
Siarhei Puhach
062ca69d9d Update views.py 2017-07-12 08:21:43 +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
PCoder
cfc1210a9a We probably need creating HostingBill 2017-07-07 00:12:29 +05:30
Siarhei Puhach
759bfd75a3 Added question image file 2017-07-06 14:18:57 +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
Mondi Geetha
b9d32afc67 Changed some styles for modal popup 2017-07-03 22:32:34 +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
siarheipuhach
a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03: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
M.Ravi
9aba565ec0 Added + corrected de translations 2017-06-23 01:15:48 +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