Pcoder
|
b649bcd87e
|
Fixed a typo
|
2017-06-29 21:24:04 +02: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 |
|