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 |
|
Levi
|
1897f4b5f6
|
fixing date format
|
2017-06-21 13:28:53 -05:00 |
|
Levi
|
339e20d0b7
|
changd date format on orders view
|
2017-06-21 13:24:38 -05:00 |
|
M.Ravi
|
387c45b969
|
We need the logo in the payment page even when user is not logged in
|
2017-06-21 23:38:35 +05:30 |
|
Levi
|
f1f6074c78
|
fixed time
|
2017-06-21 12:49:29 -05:00 |
|
Levi
|
ed6fdcb049
|
fixed ssh key time
|
2017-06-21 12:26:09 -05:00 |
|
Levi
|
d8389993ce
|
Merge branch 'master' into feature/added_localtime
|
2017-06-21 12:06:58 -05:00 |
|
Levi
|
4f318a6f2d
|
changed UTC to localtime in ssh key view
|
2017-06-21 11:48:11 -05:00 |
|
Levi
|
9b6bb4eb26
|
changed UTC to localtime in ssh key view
|
2017-06-21 11:45:35 -05:00 |
|
M.Ravi
|
8dca67e638
|
Increased top margin for email confirmation and validation forms
|
2017-06-19 23:53:25 +05:30 |
|
M.Ravi
|
3cf7f8bd57
|
Updated css to center align text in registration success message
|
2017-06-19 12:55:14 +05:30 |
|
M.Ravi
|
0a6275bcef
|
Merge branch 'master' into task/3379/text_style_activation
|
2017-06-19 12:37:09 +05:30 |
|
Pcoder
|
0cbd3aa666
|
Merge pull request #349 from pcoder/bug/3416/error_vm_id_change
Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him.
|
2017-06-18 17:12:52 +02:00 |
|
M.Ravi
|
ab50e58a72
|
Updated signup and email confirmation views to work with translation
|
2017-06-17 19:38:43 +05:30 |
|
M.Ravi
|
e63e014588
|
Added Lato font for sign up success text
|
2017-06-17 17:34:30 +05:30 |
|
M.Ravi
|
bf99bd5edb
|
Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him
|
2017-06-17 14:46:11 +05:30 |
|
M.Ravi
|
c2f8ae1eb3
|
Fixed a responsive issue in signup/email confirmation
|
2017-06-17 13:41:18 +05:30 |
|
Levi
|
7a4d3bb41f
|
Merge branch 'master' of github.com:ungleich/dynamicweb
|
2017-06-15 16:06:11 -05:00 |
|
Levi
|
13ddc8fc66
|
changed logo to datacenterlight
|
2017-06-15 16:05:46 -05:00 |
|
Levi Velázquez
|
5271591cf3
|
Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
|
2017-06-15 15:22:00 -05:00 |
|
Pcoder
|
ebaadb4d07
|
Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support
Bug/3313/pwd reset email from dcl support
|
2017-06-15 21:04:03 +02:00 |
|
Levi Velázquez
|
93bc6ac458
|
Merge pull request #344 from pcoder/bug/3256/view_details_500_error
Bug/3256/view details 500 error
|
2017-06-15 13:25:49 -05:00 |
|
Levi Velázquez
|
65cca56ab8
|
Merge pull request #341 from levivm/master
fixed credit card input issue
|
2017-06-15 11:33:27 -05:00 |
|
M.Ravi
|
09601aefd9
|
Replaced all GiB to GB
|
2017-06-15 12:18:38 +05:30 |
|
Levi Velázquez
|
657e93862d
|
Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support
|
2017-06-15 01:17:14 -05:00 |
|
M.Ravi
|
5b4e9b733d
|
Tentative fix for error 500 on order details page
|
2017-06-15 07:30:47 +05:30 |
|
M.Ravi
|
e9643c4783
|
Deleted django.mo of hosting
|
2017-06-15 07:16:17 +05:30 |
|
M.Ravi
|
412236f6a1
|
Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange
|
2017-06-15 02:37:07 +05:30 |
|
Levi
|
3a1158cab0
|
cleaned up file createvm.js
|
2017-06-14 13:05:39 -05:00 |
|
Levi
|
1a1b05f2f8
|
fixed credit card input issu
|
2017-06-14 12:50:51 -05:00 |
|
M.Ravi
|
3c5cf3f9ec
|
Rearranged navbar menu items
|
2017-06-13 23:47:57 +05:30 |
|
M.Ravi
|
a2a3cc1f5a
|
Small code formatting
|
2017-06-12 20:51:48 +05:30 |
|
M.Ravi
|
d84496b0de
|
Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset.
|
2017-06-12 20:42:17 +05:30 |
|
Henry Bravo
|
be82a63b7a
|
Reduce container in ssh_key and tetextarea
|
2017-06-11 20:04:06 -05:00 |
|
Henry Bravo
|
38970e9353
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-11 19:46:26 -05:00 |
|
Henry Bravo
|
225f92caf5
|
Change To Font Lato in VM Pages and remove messages in login
|
2017-06-11 19:46:07 -05:00 |
|
Levi
|
817f800fbd
|
fixed #3350
|
2017-06-11 11:44:14 -05:00 |
|
M.Ravi
|
c989017a8f
|
Added SignupValidateView and SignupValidatedView classes to handle respective views
|
2017-06-11 05:18:06 +05:30 |
|
M.Ravi
|
ce11524fba
|
Added signup-validate and validate endpoints to hosting's urls
|
2017-06-11 05:15:48 +05:30 |
|
M.Ravi
|
707d8e7370
|
Added condition to hosting form to show message for account that have not yet been validated after account creation
|
2017-06-11 05:14:20 +05:30 |
|
M.Ravi
|
b8463360b5
|
Added styles for message title and text for email confirmation
|
2017-06-11 05:11:09 +05:30 |
|
M.Ravi
|
bd10d1cf9f
|
Added signup_validate html template. This is an empty template that we use to show appropriate message during email confirmation
|
2017-06-11 05:10:00 +05:30 |
|
Henry Bravo
|
7004536a19
|
Fix conflicts
|
2017-06-09 16:18:41 -05:00 |
|
Henry Bravo
|
54b339a546
|
Staging fix and cleaned html
|
2017-06-09 15:37:14 -05:00 |
|
Levi
|
d43855adda
|
fixed #3350, #3328, #3316, #3339
|
2017-06-09 15:36:14 -05:00 |
|
Henry Bravo
|
7485c182c4
|
Redesign vm order page
|
2017-06-09 13:55:45 -05:00 |
|
Levi
|
96272ffd44
|
added mo files
|
2017-06-06 00:08:22 -05:00 |
|
Levi
|
a355ae9087
|
Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop
|
2017-06-05 22:51:53 -05:00 |
|
Henry Bravo
|
c69694274f
|
Fix conflicts
|
2017-06-05 14:55:41 -05:00 |
|
Levi
|
484ab5f1c6
|
fixed payment when user has already a card
|
2017-06-04 17:41:48 -05:00 |
|
Levi
|
5be46db5a3
|
Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key
|
2017-06-04 17:22:52 -05:00 |
|
Levi
|
8adcb75b8c
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-04 17:08:09 -05:00 |
|
Levi
|
ab4d1cf9c9
|
Changes stripe v2 to stripe v3 and added localization support
|
2017-06-04 17:04:38 -05:00 |
|
Henry Bravo
|
ba03cf232e
|
'what is it' section text change and fixed typo
|
2017-06-03 21:57:21 -05:00 |
|
Henry Bravo
|
9b121cc702
|
improveded mobile responsiveness
|
2017-06-03 21:19:13 -05:00 |
|
Modulos
|
346733fbcd
|
Allow users to delete ssh keys
|
2017-06-03 15:03:55 +02:00 |
|
modulos
|
ab29b138c3
|
Add delete ssh key modal
|
2017-06-03 13:33:05 +02:00 |
|
modulos
|
31e9377818
|
Merge branch 'develop' into hosting_i18n
|
2017-06-03 09:59:48 +02:00 |
|
Levi
|
f2ee18deba
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-06-02 11:20:30 -05:00 |
|
Levi
|
cd9c8938ed
|
hidden footbar on mobile devices
|
2017-06-02 11:11:04 -05:00 |
|
Levi Velázquez
|
1ae8a627f2
|
Merge pull request #300 from ungleich/master
Updating develop
|
2017-06-02 09:45:49 -05:00 |
|