PCoder
|
e9b5e052ac
|
Merged upstream master into task/3484/email_refactoring
|
2017-09-09 11:38:57 +05:30 |
|
Arvind Tiwari
|
e9e72f4883
|
hosting navbar logo link fixed to dcl landing
|
2017-09-09 00:46:13 +05:30 |
|
Arvind Tiwari
|
3852d26f37
|
merged master
|
2017-09-08 20:13:17 +05:30 |
|
Arvind Tiwari
|
60bc1a86b3
|
font weight on mobile
|
2017-09-08 03:52:24 +05:30 |
|
Arvind Tiwari
|
fc170462e2
|
font weight on mobile
|
2017-09-08 03:41:25 +05:30 |
|
Arvind Tiwari
|
bbee940720
|
padding fix
|
2017-09-08 03:19:08 +05:30 |
|
Arvind Tiwari
|
3b8c3265ca
|
Merge pull request #484 from tiwariav/task/3779/transparent_navbar
Task/3779 transparent navbar on signup-validate pages
|
2017-09-08 02:57:10 +05:30 |
|
Arvind Tiwari
|
6a56f4c689
|
logo position fix
|
2017-09-08 02:43:11 +05:30 |
|
Arvind Tiwari
|
9721784ff2
|
logo href fixed
|
2017-09-08 02:32:46 +05:30 |
|
Arvind Tiwari
|
4937baa2e0
|
dropdown style updated
|
2017-09-08 02:22:03 +05:30 |
|
Arvind Tiwari
|
d5c0fef965
|
Merge pull request #483 from tiwariav/task/3775/hosting_default_page
Task/3775 hosting/dashboard as default page
|
2017-09-08 02:03:08 +05:30 |
|
Arvind Tiwari
|
84d35ea916
|
padding fixed
|
2017-09-08 00:11:20 +05:30 |
|
Arvind Tiwari
|
b4641e9dfd
|
font wieght 300
|
2017-09-08 00:07:09 +05:30 |
|
Arvind Tiwari
|
73bbe29113
|
transparent navbar added to signup validate page
|
2017-09-07 22:47:56 +05:30 |
|
Arvind Tiwari
|
e26b6ac416
|
default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard
|
2017-09-07 22:24:03 +05:30 |
|
Arvind Tiwari
|
db891aaa1e
|
hosting navbar changed and consistent with dcl navbar
|
2017-09-07 21:01:17 +05:30 |
|
M.Ravi
|
ec300a76eb
|
Handled some more errors that can be generated when creating SSHKey
|
2017-09-07 00:44:53 +02:00 |
|
M.Ravi
|
cf6bd8a7c1
|
Validating ssh public keys using sshpubkeys
|
2017-09-07 00:31:15 +02:00 |
|
M.Ravi
|
0fc0b0630c
|
hosting: Updated OrdersHostingDetailView for stripe charging in this view
|
2017-09-06 23:52:02 +02:00 |
|
M.Ravi
|
67ab4ef0a1
|
hosting: Added order-confirmation url
|
2017-09-06 23:50:19 +02:00 |
|
M.Ravi
|
df23862ea1
|
Added per month text for price
|
2017-09-06 23:49:38 +02:00 |
|
PCoder
|
2a9b208719
|
hosting: Moving the stripe charge to order confirmation page (still incomplete)
|
2017-09-06 13:25:18 +05:30 |
|
Arvind Tiwari
|
d13d9bf441
|
removed edit option from card details
|
2017-09-05 22:09:18 +05:30 |
|
Arvind Tiwari
|
5d3f355c36
|
no card added
|
2017-09-05 01:51:53 +05:30 |
|
Arvind Tiwari
|
3ff0c4a1a2
|
merged master
|
2017-09-04 23:52:22 +05:30 |
|
PCoder
|
f84b95e385
|
Added some translations
|
2017-09-04 22:27:59 +05:30 |
|
PCoder
|
8ac8b25d78
|
Updated new vm email template
|
2017-09-04 12:32:53 +05:30 |
|
M.Ravi
|
f7129e0b23
|
Removed an invalid quote from cancel email template
|
2017-09-03 17:49:31 +02:00 |
|
M.Ravi
|
da4ca01524
|
Fixed hosting django.po error
|
2017-09-03 17:16:25 +02:00 |
|
M.Ravi
|
43e4c021a7
|
Removed order id from cancel vm email templates
|
2017-09-03 17:13:49 +02:00 |
|
M.Ravi
|
a32c8ea467
|
Corrected VM cancellation email templates
|
2017-09-03 13:20:30 +02:00 |
|
M.Ravi
|
0d4c40cfa2
|
Fixed missing trans tag in _footer.html
|
2017-09-03 12:44:42 +02:00 |
|
PCoder
|
f041a4047d
|
Started with VM cancellation template
|
2017-09-03 02:33:05 +05:30 |
|
M.Ravi
|
8f2655bda2
|
Getting vm name properly in hosting views
|
2017-09-02 21:35:57 +02:00 |
|
M.Ravi
|
50431542f8
|
Corrected getting VM name in template
|
2017-09-02 20:42:58 +02:00 |
|
PCoder
|
b5120040d3
|
Fixed an error and from address in new vm email template
|
2017-09-02 22:47:31 +05:30 |
|
PCoder
|
e38df305c4
|
New VM email template updated
|
2017-09-02 22:08:25 +05:30 |
|
PCoder
|
7d12eff9be
|
Added translations and reformatted code
|
2017-09-02 16:50:09 +05:30 |
|
PCoder
|
1c42623964
|
Fixed some password reset email translation issues
|
2017-09-02 16:24:25 +05:30 |
|
PCoder
|
f701f10e24
|
Added missing site_name
|
2017-09-02 16:07:05 +05:30 |
|
PCoder
|
22f07837e0
|
Added missing password_reset_url
|
2017-09-02 16:05:24 +05:30 |
|
PCoder
|
00e4ae5b76
|
Added missing new line character
|
2017-09-02 16:03:39 +05:30 |
|
PCoder
|
b4ba882c9c
|
Added password reset email translation
|
2017-09-02 16:01:39 +05:30 |
|
PCoder
|
7c70ee637a
|
Updated password reset template
|
2017-09-02 15:56:17 +05:30 |
|
PCoder
|
fd87023681
|
Merge branch 'master' into task/3731/cdist_ssh_key_handler
|
2017-09-02 11:00:40 +05:30 |
|
Arvind Tiwari
|
95f4cb3753
|
fix
|
2017-09-02 03:14:02 +05:30 |
|
Arvind Tiwari
|
b9f0a886e0
|
translation fixes
|
2017-09-02 03:09:02 +05:30 |
|
Arvind Tiwari
|
4b24c227ee
|
Merge pull request #476 from tiwariav/bugfix/hosting_payment_navbar
bugfix/hosting datacenterlight payment template separated
|
2017-09-02 02:04:32 +05:30 |
|
Arvind Tiwari
|
979844e55b
|
hosting payment and datacenterlight payment files supported
|
2017-09-02 02:02:05 +05:30 |
|
Arvind Tiwari
|
fa5bf56f73
|
Merge pull request #475 from tiwariav/bugfix/translation
Bugfix/translation
|
2017-09-02 01:50:29 +05:30 |
|
Arvind Tiwari
|
1426cba3a5
|
approved, declined translations added
|
2017-09-02 01:48:51 +05:30 |
|
Arvind Tiwari
|
6f091279d7
|
translation fix on vm list page
|
2017-09-02 01:45:07 +05:30 |
|
Arvind Tiwari
|
5f384d430b
|
Merge pull request #474 from tiwariav/task/3735/modal_btn_width
Task/3735 modal btn min-width, modal width increased
|
2017-09-02 00:32:08 +05:30 |
|
Arvind Tiwari
|
765432acbc
|
minor fix
|
2017-09-02 00:17:01 +05:30 |
|
Arvind Tiwari
|
4a3ab29bd5
|
minor fix
|
2017-09-02 00:14:12 +05:30 |
|
Arvind Tiwari
|
31552b886f
|
btn styles fixed
|
2017-09-02 00:11:16 +05:30 |
|
Arvind Tiwari
|
79cf5e416c
|
modal btn min width, modal width increased
|
2017-09-01 23:56:01 +05:30 |
|
Arvind Tiwari
|
2fe3232d91
|
Merge branch 'master' into task/3704/my_settings
|
2017-09-01 23:14:32 +05:30 |
|
Arvind Tiwari
|
b622e53313
|
translation fix, master merged
|
2017-09-01 23:13:54 +05:30 |
|
Arvind Tiwari
|
03a96f5457
|
Merge pull request #458 from tiwariav/task/3678/remove_lato_font_files
Task/3678 remove lato font files
|
2017-09-01 22:53:52 +05:30 |
|
Arvind Tiwari
|
b1baf564db
|
navbar-header clickable, contact href fixed, highlights focus color fixed
|
2017-09-01 02:05:24 +05:30 |
|
Arvind Tiwari
|
5550867870
|
navbar link hash fixed, footer links fixed
|
2017-09-01 01:27:44 +05:30 |
|
PCoder
|
8eca78b043
|
Reorganized imports hosting/forms.py
|
2017-09-01 00:58:30 +05:30 |
|
PCoder
|
3b0d2f8802
|
Merge branch 'master' into task/3731/cdist_ssh_key_handler
|
2017-09-01 00:53:30 +05:30 |
|
Arvind Tiwari
|
3ed2399337
|
merge master
|
2017-09-01 00:39:01 +05:30 |
|
Arvind Tiwari
|
d0e770d0df
|
merge conflict resolved
|
2017-08-31 23:47:42 +05:30 |
|
Arvind Tiwari
|
e94f9a5d2b
|
dropdown style fix
|
2017-08-31 23:42:18 +05:30 |
|
Arvind Tiwari
|
8b2e1988a0
|
Merge pull request #472 from tiwariav/task/3748/place_order_msg
Task/3748 place order msg position fixed for mobile
|
2017-08-31 23:41:09 +05:30 |
|
Arvind Tiwari
|
eafabf29a7
|
remove card link style bugfix
|
2017-08-31 23:05:06 +05:30 |
|
Arvind Tiwari
|
cf673c8f90
|
icon added to my settings page
|
2017-08-31 22:47:47 +05:30 |
|
M.Ravi
|
5a46cea307
|
Added functionality to add keys on creating a new vm
|
2017-08-31 18:20:02 +02:00 |
|
Arvind Tiwari
|
a68d9dd749
|
msg margin increased
|
2017-08-31 21:34:12 +05:30 |
|
Arvind Tiwari
|
f5bf44ad7b
|
translation fix
|
2017-08-31 20:16:57 +05:30 |
|
Arvind Tiwari
|
da41045b0f
|
ssh key heading changed 'Your SSH Keys' -> 'My SSH Keys'
|
2017-08-31 20:02:20 +05:30 |
|
Arvind Tiwari
|
9bcd064aae
|
btn text changed 'View Details' -> 'View Invoice'
|
2017-08-31 15:59:22 +05:30 |
|
Arvind Tiwari
|
a07922e4d4
|
style and translations fix
|
2017-08-31 15:54:01 +05:30 |
|
M.Ravi
|
60561be3b9
|
Added missing condition and reformatted code
|
2017-08-31 12:20:06 +02:00 |
|
PCoder
|
79ecdadeb2
|
Added ssh public key validation
|
2017-08-31 12:53:00 +05:30 |
|
PCoder
|
46642d816a
|
Merged master into task/3731/cdist_ssh_key_handler
|
2017-08-31 01:09:12 +05:30 |
|
Arvind Tiwari
|
9ab82298c5
|
edit card, remove settings styles
|
2017-08-30 20:00:59 +05:30 |
|
Arvind Tiwari
|
43ceea948e
|
merged master
|
2017-08-30 19:38:19 +05:30 |
|
Arvind Tiwari
|
f45ec16091
|
added options to card details
|
2017-08-30 19:35:23 +05:30 |
|
Arvind Tiwari
|
e91ea758e3
|
Merge pull request #461 from tiwariav/task/3717/input_border_warning
Task/3717/ changed border color for error input
|
2017-08-30 17:11:12 +05:30 |
|
Arvind Tiwari
|
e4b5ed5e4b
|
hover color fix
|
2017-08-30 16:14:02 +05:30 |
|
Arvind Tiwari
|
03ab40eed5
|
proportions fixed for dashboard box
|
2017-08-30 16:05:35 +05:30 |
|
M.Ravi
|
51b1ee2013
|
Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
|
2017-08-30 12:02:53 +02:00 |
|
M.Ravi
|
92e47b6f90
|
Added manage_public_key when deleting a key (However, this does not seem to work in cdist)
|
2017-08-30 09:42:56 +02:00 |
|
M.Ravi
|
34580b6514
|
Refactored saving public key functionality to opennebula_api.models.save_public_key. Also, now creating hosting VMs loaded by default with ONEADMIN_USER_SSH_PUBLIC_KEY
|
2017-08-29 17:53:25 +02:00 |
|
Arvind Tiwari
|
919ad6e869
|
email added to contact button
|
2017-08-29 18:01:00 +05:30 |
|
Arvind Tiwari
|
591c51bb46
|
translation fix
|
2017-08-29 17:57:11 +05:30 |
|
Arvind Tiwari
|
42a4c319a3
|
Merge branch 'master' into task/3703/hosting_dashboard
|
2017-08-29 17:52:06 +05:30 |
|
Arvind Tiwari
|
58e7a2aca7
|
saving cardholder name
|
2017-08-29 17:48:41 +05:30 |
|
Arvind Tiwari
|
32ba9c5ff7
|
Merge branch 'master' into task/3704/my_settings
|
2017-08-29 17:42:40 +05:30 |
|
Arvind Tiwari
|
ce1d346bc1
|
billing form in settings page
|
2017-08-29 17:42:35 +05:30 |
|
Arvind Tiwari
|
49cc441fa0
|
style changes
|
2017-08-29 14:53:03 +05:30 |
|
Arvind Tiwari
|
e032fb744c
|
svg images fixed
|
2017-08-29 14:24:27 +05:30 |
|
PCoder
|
12255364b2
|
Attempted to get hosts for adding ssh keys (to be tested)
|
2017-08-29 13:31:05 +05:30 |
|
PCoder
|
2ed07e25ff
|
Corrected translation for 'You are not making payment ...'
|
2017-08-25 09:49:55 +05:30 |
|
Arvind Tiwari
|
daa50d4672
|
settings page design
|
2017-08-24 22:11:15 +05:30 |
|
Arvind Tiwari
|
9be42f3fd4
|
links added to the boxes
|
2017-08-24 20:36:00 +05:30 |
|