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
|
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 |
|
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 |
|
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 |
|
modulos
|
715d092b96
|
Add ssh key to new vm
Create_vm now stes to public key correctly
|
2017-06-02 00:53:22 +02:00 |
|
modulos
|
ef0589f691
|
Add german translation
|
2017-06-01 23:06:29 +02:00 |
|
Henry Bravo
|
be04bee643
|
Fix center login pages
|
2017-06-01 15:40:19 -05:00 |
|
modulos
|
d229d124e9
|
Merge branch 'develop' into api/cleanup
|
2017-06-01 21:51:15 +02:00 |
|
Henry Bravo
|
024f7565df
|
Fixed details in Hosting pages and translate in login
|
2017-06-01 11:24:50 -05:00 |
|
modulos
|
37a9629408
|
Add more translations
|
2017-05-30 15:57:36 +02:00 |
|
modulos
|
9416586d0b
|
Merge branch 'develop' into hosting_i18n
|
2017-05-30 15:10:22 +02:00 |
|
Henry Bravo
|
a7c28f5644
|
Fix conflic translates
|
2017-05-29 15:05:11 -05:00 |
|
modulos
|
796a56872c
|
Add translation for CHF/Month
|
2017-05-29 18:05:21 +02:00 |
|
modulos
|
48050a2360
|
Remove .mo files and update .po files
|
2017-05-29 16:12:28 +02:00 |
|
modulos
|
40fe3f4d29
|
Merge branch 'develop' into hosting_i18n
|
2017-05-29 15:47:22 +02:00 |
|
modulos
|
1d95f87b8d
|
Merge branch 'develop' into dcl_i18n
|
2017-05-29 15:25:18 +02:00 |
|
modulos
|
f142bb1ce9
|
Move keys section underneath user name menu
|
2017-05-29 15:00:47 +02:00 |
|
modulos
|
5dfb56eb6f
|
Add more german translations
|
2017-05-29 14:36:05 +02:00 |
|
modulos
|
6937fb98f0
|
Merge branch 'develop' into hosting_i18n
|
2017-05-29 14:00:53 +02:00 |
|
Henry Bravo
|
67d24462ec
|
Apply design in Signup and change password, and fixed details
|
2017-05-28 12:57:02 -05:00 |
|
Henry Bravo
|
3f0a93357f
|
Login page design new styles
|
2017-05-28 00:44:36 -05:00 |
|
Henry Bravo
|
ac28ab0d6b
|
Fix texts bugs and hosting mobile design
|
2017-05-27 10:39:30 -05:00 |
|
Levi
|
59be6a7413
|
Merge branch 'master' into develop
|
2017-05-26 13:03:08 -05:00 |
|
modulos
|
a044490ec3
|
Add i18n to hosting/order
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
|
2017-05-26 17:02:22 +02:00 |
|
modulos
|
5869c6dd87
|
Add i18n to datacenterlight
The pricing page is now fully i18n as well as the subscription modal
|
2017-05-26 15:53:21 +02:00 |
|
M.Ravi
|
6a6f403704
|
Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html
|
2017-05-26 02:47:20 +05:30 |
|
Henry Bravo
|
549acd400a
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-05-25 13:31:16 -05:00 |
|
Henry Bravo
|
c91a61b33c
|
Fix order columns in hosting/payment
|
2017-05-25 13:27:47 -05:00 |
|
Levi Velázquez
|
211e1be0fb
|
Merge pull request #279 from levivm/develop
Develop
|
2017-05-25 13:05:48 -05:00 |
|
Levi
|
d9d8ddc9e1
|
removed import pdb
|
2017-05-25 13:05:32 -05:00 |
|
Levi
|
9a93a3e315
|
fixed vm pricing error
|
2017-05-25 13:04:29 -05:00 |
|
modulos
|
d395735219
|
Redirect new user to key generation view
|
2017-05-25 16:23:31 +02:00 |
|
modulos
|
4b89e71b1f
|
Merge branch 'develop' into fix_redirect
|
2017-05-25 16:19:34 +02:00 |
|
modulos
|
35f129a4c7
|
Add user generated public ssh keys as well
|
2017-05-25 15:54:32 +02:00 |
|
modulos
|
c6db1450a1
|
Correct vm configuration flow
A user now get's redirected to vm list view when pressing 'finish
configuration'
|
2017-05-25 12:39:23 +02:00 |
|
modulos
|
9753dfd2fc
|
Add UserHosting public key to opennebula user
|
2017-05-25 11:27:49 +02:00 |
|
Levi
|
4daf6ac3ac
|
added redirect after create vm ssh key
|
2017-05-24 11:09:54 -05:00 |
|
Levi
|
ee80181a55
|
added redirect after create vm ssh key
|
2017-05-24 10:58:16 -05:00 |
|
modulos
|
df0b4f2629
|
Merge branch 'develop' into order_now
|
2017-05-23 19:31:58 +02:00 |
|
modulos
|
15259e59f2
|
Add support for sign up redirection
|
2017-05-23 19:18:51 +02:00 |
|
Levi
|
3d03d00201
|
fixed ip format in virtual machine list
|
2017-05-23 11:52:53 -05:00 |
|
Levi
|
60fc2890f1
|
added ipv4 and ipv6 to virtualmachine list
|
2017-05-23 11:50:08 -05:00 |
|
Levi
|
e278ff742d
|
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
|
2017-05-23 11:48:25 -05:00 |
|
Levi
|
8d81220202
|
changed virtual machine list
|
2017-05-23 11:48:02 -05:00 |
|
modulos
|
adf9b77e4e
|
Show ipv6 address
|
2017-05-23 11:30:10 +02:00 |
|
modulos
|
e782290eeb
|
Fix NoReverseMatch for create-virtual-machine
|
2017-05-22 12:53:01 +02:00 |
|
Levi
|
d71c3093e8
|
added price to create vm view
|
2017-05-21 22:49:56 -05:00 |
|
Levi
|
cb33e6a750
|
added price to create vm view
|
2017-05-21 22:48:10 -05:00 |
|
Levi
|
34d596f2ba
|
added next url to ssh create key view
|
2017-05-21 22:46:31 -05:00 |
|
Levi
|
05bf8db38a
|
added next url to ssh create key view
|
2017-05-21 22:39:47 -05:00 |
|
Levi
|
65c6f1342b
|
added next url to ssh create key view
|
2017-05-21 22:38:12 -05:00 |
|
Levi
|
02a2ac31c6
|
added next url to ssh create key view
|
2017-05-21 22:35:43 -05:00 |
|
Levi
|
3f198bb4de
|
Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro
|
2017-05-21 22:01:26 -05:00 |
|
Levi
|
03ec8ef674
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-20 11:20:30 -05:00 |
|
Levi
|
5dd54f4219
|
added redirect
|
2017-05-20 11:06:10 -05:00 |
|
Modulos
|
1e2b8b1652
|
Add connection error handling
|
2017-05-14 12:22:10 +02:00 |
|
Modulos
|
d7bd142387
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-14 03:41:56 +02:00 |
|
Modulos
|
8a18c275c3
|
Display configuration in virtualmachine detail
|
2017-05-14 03:41:30 +02:00 |
|
Levi Velázquez
|
d031488514
|
Merge pull request #242 from levivm/opennebula_api
added permissions to hosting bill view
|
2017-05-13 20:20:02 -05:00 |
|
Levi
|
bcc32174b2
|
added permissions to hosting bill view
|
2017-05-13 20:19:09 -05:00 |
|
Levi Velázquez
|
de3fa34e7e
|
Merge pull request #241 from levivm/opennebula_api
fixed create vm button display
|
2017-05-13 19:58:27 -05:00 |
|
Levi
|
d5749f65f1
|
fixed create vm button display
|
2017-05-13 19:57:23 -05:00 |
|
Modulos
|
46b918d175
|
Fix price calculation
|
2017-05-14 02:18:10 +02:00 |
|
Levi
|
e6ec14dfe7
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-13 12:22:21 -05:00 |
|
Modulos
|
85d3158dbd
|
Fix order price
|
2017-05-13 17:02:45 +02:00 |
|
Modulos
|
752e11bcea
|
Readded hostingplans
|
2017-05-13 13:47:53 +02:00 |
|
Modulos
|
8017fbb90f
|
Work on configuration
|
2017-05-13 10:00:07 +02:00 |
|
Levi
|
d8c8804cc4
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-13 00:31:33 -05:00 |
|
Levi
|
07dc04018f
|
cleaned code
|
2017-05-13 00:31:29 -05:00 |
|
Modulos
|
75d93b2aad
|
Add images as configuration
|
2017-05-13 06:59:57 +02:00 |
|
Modulos
|
c816d280ee
|
Remove opennebula_functions.py
|
2017-05-13 05:52:27 +02:00 |
|
Modulos
|
cfaf201064
|
Handle ConnectionException, add change_user_password
|
2017-05-13 05:50:56 +02:00 |
|
Levi
|
8980f6b2fc
|
merged opnnebula api changes
|
2017-05-12 12:13:18 -05:00 |
|
Modulos
|
130c00c8ee
|
API Integration
Please review carefully.
|
2017-05-12 12:07:05 +02:00 |
|
Levi
|
3873540849
|
Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149
|
2017-05-12 00:56:35 -05:00 |
|
Levi
|
1a6e1a44d8
|
fixing formatting
|
2017-05-11 00:38:53 -05:00 |
|
Levi
|
1f10f04a9d
|
Fixed ssh key error, Now an existing user is not ask for his credit card again
|
2017-05-11 00:11:33 -05:00 |
|
Modulos
|
f1ae7e1014
|
Fix _get_or_create_user
|
2017-05-09 05:54:10 +02:00 |
|
Modulos
|
63052df6c9
|
Change to new OpenNebula functions
|
2017-05-09 05:05:58 +02:00 |
|
Modulos
|
d0fc0144e5
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-09 04:56:03 +02:00 |
|
Levi
|
9a34518457
|
attached opennebula vm id to virtualmachine plan
|
2017-05-08 21:54:12 -05:00 |
|
Levi
|
abf6dbddce
|
added create vm feature from a normal user in opennebula
|
2017-05-08 21:49:40 -05:00 |
|
Modulos
|
6dedf3693e
|
Change to use OpenNebulaManager
|
2017-05-09 04:41:45 +02:00 |
|
Modulos
|
7010c76c72
|
Add floatformat
|
2017-05-09 04:41:35 +02:00 |
|
Modulos
|
38b2aa8986
|
Create HostingBill obj when payment's successful
|
2017-05-09 04:40:41 +02:00 |
|
Modulos
|
3ee075fad9
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-09 04:04:53 +02:00 |
|
Levi
|
bd83545653
|
Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration
|
2017-05-08 19:06:12 -05:00 |
|
Levi
|
7ae49d00dd
|
added opennebula manager claass
|
2017-05-08 19:02:29 -05:00 |
|
Modulos
|
c745a8c402
|
Remove comment
I assume that only clients are StripeCustomer objects
|
2017-05-08 16:00:42 +02:00 |
|
Modulos
|
3078536bd7
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-08 15:46:53 +02:00 |
|
M.Ravi
|
621376c5b4
|
Added functionality to create opennebula user if it does not exist
|
2017-05-08 16:23:03 +05:30 |
|
M.Ravi
|
970ae1d0b2
|
Manual merge of levi/opennebula-integration
|
2017-05-08 12:34:28 +05:30 |
|
M.Ravi
|
a1eea9162e
|
Added logger methods for print.
|
2017-05-08 11:36:46 +05:30 |
|
Modulos
|
ae69a56ab2
|
Add error handling
|
2017-05-08 02:47:38 +02:00 |
|
Modulos
|
a22c8cad51
|
Fix cosmetic detail
|
2017-05-08 02:46:11 +02:00 |
|
Levi Velázquez
|
0220867772
|
Merge pull request #225 from levivm/opennebula-integration
added get vms
|
2017-05-07 19:05:45 -05:00 |
|
Levi
|
d72c1c810d
|
added get vms
|
2017-05-07 18:57:44 -05:00 |
|
Modulos
|
b4ec750728
|
Return error page if HostingBill is None
|
2017-05-08 01:56:02 +02:00 |
|
Modulos
|
f871bb2aba
|
Show correct user name and email
|
2017-05-08 01:43:47 +02:00 |
|
Levi Velázquez
|
23f58ead52
|
Merge pull request #224 from levivm/opennebula-integration
Opennebula integration
|
2017-05-07 17:48:05 -05:00 |
|
Levi
|
233642a6b1
|
removed pdb
|
2017-05-07 17:47:41 -05:00 |
|
Levi
|
1ebc3b8be4
|
testing
|
2017-05-07 17:46:03 -05:00 |
|
Modulos
|
c2a76e6c39
|
Merge migrations and fix spacing
|
2017-05-07 16:09:41 +02:00 |
|
Modulos
|
4ab8963149
|
Follow fat models small views
Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model.
|
2017-05-07 16:07:38 +02:00 |
|
Modulos
|
d146c25899
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-07 06:29:29 +02:00 |
|
M.Ravi
|
6d4e9d8a83
|
Refactored code to introduce different VM templates
|
2017-05-07 05:31:39 +05:30 |
|
Levi Velázquez
|
07a3d8649c
|
Merge pull request #223 from levivm/opennebula-integration
fixing vm list
|
2017-05-06 18:40:14 -05:00 |
|
Levi
|
e67148ff59
|
fixing vm list
|
2017-05-06 18:39:19 -05:00 |
|
Levi Velázquez
|
a04955eb59
|
Merge pull request #222 from levivm/opennebula-integration
adding method to list vms
|
2017-05-06 18:37:30 -05:00 |
|
Levi
|
b0a27b8c75
|
adding method to list vms
|
2017-05-06 18:36:51 -05:00 |
|
Levi Velázquez
|
e1a61ba930
|
Merge pull request #217 from levivm/opennebula-integration
Opennebula integration
|
2017-05-06 18:27:35 -05:00 |
|
Levi
|
2ac34ff295
|
fixed virtual machines template
|
2017-05-06 18:25:15 -05:00 |
|
Levi
|
e99be51de1
|
adding list vm
|
2017-05-06 18:19:28 -05:00 |
|
Levi
|
767a5fc5da
|
fixing errors on vm creation
|
2017-05-06 18:17:47 -05:00 |
|
Levi
|
3994d2d33b
|
added migratin
|
2017-05-06 18:12:25 -05:00 |
|
Levi
|
90307724c8
|
added null true to opennebula id atribute
|
2017-05-06 18:09:01 -05:00 |
|