PCoder
|
c1a8689199
|
Merged upstream master into task/3772/hosting_billing_monthly_subscription
|
2017-09-09 21:40:37 +05:30 |
|
M.Ravi
|
e135bc9e8c
|
hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
|
2017-09-09 13:27:17 +02:00 |
|
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
|
fc170462e2
|
font weight on mobile
|
2017-09-08 03:41:25 +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
|
73bbe29113
|
transparent navbar added to signup validate page
|
2017-09-07 22:47:56 +05:30 |
|
Arvind Tiwari
|
db891aaa1e
|
hosting navbar changed and consistent with dcl navbar
|
2017-09-07 21:01:17 +05:30 |
|
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
|
8ac8b25d78
|
Updated new vm email template
|
2017-09-04 12:32:53 +05:30 |
|
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
|
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
|
1c42623964
|
Fixed some password reset email translation issues
|
2017-09-02 16:24:25 +05:30 |
|
PCoder
|
7c70ee637a
|
Updated password reset template
|
2017-09-02 15:56:17 +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
|
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
|
b622e53313
|
translation fix, master merged
|
2017-09-01 23:13:54 +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
|
cf673c8f90
|
icon added to my settings page
|
2017-08-31 22:47:47 +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 |
|
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
|
919ad6e869
|
email added to contact button
|
2017-08-29 18:01:00 +05:30 |
|
Arvind Tiwari
|
58e7a2aca7
|
saving cardholder name
|
2017-08-29 17:48:41 +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
|
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 |
|
Arvind Tiwari
|
23bf602a16
|
merged master, fixed translation
|
2017-08-24 20:16:26 +05:30 |
|
M.Ravi
|
5e26d6df04
|
Simplified text -> You are not making payment + translation
|
2017-08-24 13:18:59 +02:00 |
|
M.Ravi
|
60df9a888c
|
Added translation for month
|
2017-08-24 12:48:30 +02:00 |
|
PCoder
|
ebff2cbd94
|
hosting/payment.html: Added /month text and adjusted width
|
2017-08-24 12:55:22 +05:30 |
|
Pcoder
|
0026874f09
|
Merge pull request #462 from pcoder/task/3737/ga_exists_on_all_pages
Corrected/added missing google analytics and reformated code
|
2017-08-24 00:00:22 +02:00 |
|
PCoder
|
703644ced4
|
Removed orphaned alt tag
|
2017-08-24 03:17:39 +05:30 |
|
Arvind Tiwari
|
30551e5ac5
|
merged master
|
2017-08-24 00:59:17 +05:30 |
|
Arvind Tiwari
|
4cf6df64a8
|
btn link fixed
|
2017-08-23 23:59:18 +05:30 |
|
Arvind Tiwari
|
788621bd2b
|
test markup removed
|
2017-08-23 23:07:40 +05:30 |
|
Arvind Tiwari
|
e50baf50e8
|
increased padding
|
2017-08-23 21:51:56 +05:30 |
|
Arvind Tiwari
|
0cac35831a
|
code cleanup, translations fix
|
2017-08-23 19:22:59 +05:30 |
|
Arvind Tiwari
|
12844ac0d9
|
dashboard page
|
2017-08-22 21:35:30 +05:30 |
|
Arvind Tiwari
|
6890c82122
|
dashboard url, view,template and css added
|
2017-08-22 20:45:18 +05:30 |
|
Arvind Tiwari
|
653b3654b8
|
merged master
|
2017-08-20 22:04:48 +05:30 |
|
Arvind Tiwari
|
395fa371db
|
my orders page redesigned
|
2017-08-20 21:40:17 +05:30 |
|
Arvind Tiwari
|
fb82ef6018
|
Merge pull request #450 from tiwariav/task/3695/vm_list_design
task/3695 new design for hosting/my-virtual-machines
|
2017-08-20 03:00:52 +05:30 |
|
Arvind Tiwari
|
a55170dcf2
|
copied tooltip position chaged to left from bottom
|
2017-08-19 02:40:54 +05:30 |
|
Arvind Tiwari
|
de481e8114
|
invoice link fixed
|
2017-08-19 02:32:37 +05:30 |
|
Arvind Tiwari
|
377f82319d
|
buttons made to work
|
2017-08-19 02:21:34 +05:30 |
|
Arvind Tiwari
|
5e5e33ce70
|
alignment and last item border
|
2017-08-18 23:27:57 +05:30 |
|
Pcoder
|
a80b0668a2
|
Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
|
2017-08-17 20:50:18 +02:00 |
|
Arvind Tiwari
|
1547b725d0
|
new vm_details page
|
2017-08-17 02:48:35 +05:30 |
|
Arvind Tiwari
|
b09477c874
|
text changed Ipv -> IPv
|
2017-08-16 20:41:55 +05:30 |
|
Arvind Tiwari
|
079f0ed68d
|
status text capitalization changed to Titlecaps
|
2017-08-16 20:35:14 +05:30 |
|
Arvind Tiwari
|
a2229d3250
|
created translations
|
2017-08-16 04:26:17 +05:30 |
|
Arvind Tiwari
|
df97a16a26
|
removed old markup
|
2017-08-16 04:14:46 +05:30 |
|
Arvind Tiwari
|
337021a470
|
added other conditional components on page
|
2017-08-16 04:13:40 +05:30 |
|
Arvind Tiwari
|
8160e53ea7
|
removed commented html
|
2017-08-16 04:10:08 +05:30 |
|
Arvind Tiwari
|
aec4073af5
|
removed testing markup from html
|
2017-08-16 04:08:44 +05:30 |
|
Arvind Tiwari
|
e92e3a9527
|
new design for page /my-virtual-machines
|
2017-08-16 04:02:22 +05:30 |
|
Arvind Tiwari
|
7825114f5e
|
Merge pull request #445 from tiwariav/bugfix/3683/hosting_footer
bugfix/3683 footer fix on hosting
|
2017-08-12 01:28:31 +05:30 |
|
ARvind Tiwari
|
f8ce8f975f
|
footer fix on hosting
|
2017-08-12 00:49:20 +05:30 |
|
Arvind Tiwari
|
fcc8c4718c
|
Merge pull request #444 from tiwariav/bug/3677/ssh-key-modal
bugfix/3677 ssh modal key wrapping
|
2017-08-12 00:42:59 +05:30 |
|
ARvind Tiwari
|
3ccbf3a3ac
|
ssh modal key word-break fixed so that it wraps
|
2017-08-11 01:49:41 +05:30 |
|
ARvind Tiwari
|
ac0787bdd5
|
modal title font-weight and capitalization fix
|
2017-08-08 23:01:19 +05:30 |
|
ARvind Tiwari
|
5cea467deb
|
master merged
|
2017-08-07 22:23:51 +05:30 |
|
Siarhei Puhach
|
72ddfd96ab
|
Payment error was unified
|
2017-08-07 17:23:58 +03:00 |
|
Siarhei Puhach
|
a71ccbc566
|
Added error hash in url, added payment error handler to hosting/views
|
2017-08-07 17:02:47 +03:00 |
|
Siarhei Puhach
|
4fea099b5d
|
Changed invalid credit card error style
|
2017-08-07 10:05:12 +03:00 |
|
Siarhei Puhach
|
4de04b2663
|
Changed visa card error placement
|
2017-08-07 09:56:57 +03:00 |
|
PCoder
|
7d334fddb0
|
Merge branch 'bugfix/modal_icons' of https://github.com/tiwariav/dynamicweb into tiwariav-bugfix/modal_icons
|
2017-08-04 23:53:47 +05:30 |
|
Pcoder
|
c1ad5e0b30
|
Merge pull request #422 from tiwariav/bugfix/3621/mobile_signup
bugfix #3621 signup page layout fix mobile, confirm-reset-page layout fix
|
2017-08-04 19:59:00 +02:00 |
|
Siarhei Puhach
|
fd2bc6e5cf
|
Merge branch 'feature/task3637' of https://github.com/siarheipuhach/dynamicweb into feature/task3637
|
2017-08-04 12:40:14 +03:00 |
|
Siarhei Puhach
|
8769c4cd1f
|
Changed payment error message style
|
2017-08-04 12:38:24 +03:00 |
|
Siarhei Puhach
|
657e97fc6d
|
Merge branch 'master' into feature/task3637
|
2017-08-04 11:05:37 +03:00 |
|
Siarhei Puhach
|
29fb771afb
|
Changed payment error place, changed message source to Stripe errors handler
|
2017-08-04 11:01:32 +03:00 |
|
PCoder
|
94bc552f75
|
Resolved conflicts
|
2017-08-04 03:25:47 +05:30 |
|
Pcoder
|
5b8e73984e
|
Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix
Bug/3623/hosting my orders header fix
|
2017-08-03 23:38:22 +02:00 |
|
ARvind Tiwari
|
9f67af0739
|
modal icons fixed
|
2017-08-04 02:54:34 +05:30 |
|
Pcoder
|
3d051aee14
|
Merge pull request #428 from tiwariav/task/3620/ssh_keys
task/3620 ssh_keys_choice page new design
|
2017-08-03 22:53:12 +02:00 |
|
ARvind Tiwari
|
3560eede37
|
ssh list modal and table paddings
|
2017-08-04 02:05:27 +05:30 |
|
ARvind Tiwari
|
75afb59d77
|
flex removed from dash-borad content, reset-password message added to login page
|
2017-08-04 00:28:15 +05:30 |
|
Pcoder
|
957c677e67
|
Merge pull request #427 from pcoder/bug/3627/outline_box
bug/3627/Add missing outline border around the text
|
2017-08-03 20:36:00 +02:00 |
|
ARvind Tiwari
|
0993d8c106
|
reviewed changes
|
2017-08-03 22:00:41 +05:30 |
|
Siarhei Puhach
|
34acf2310b
|
Added stripe failed payment error handler
|
2017-08-03 12:47:34 +03:00 |
|
ARvind Tiwari
|
3081786f0b
|
merged master, conflict resolved
|
2017-08-03 03:27:46 +05:30 |
|
ARvind Tiwari
|
bbdea342cf
|
merged master, conflict resolved
|
2017-08-03 03:20:59 +05:30 |
|
ARvind Tiwari
|
a3d5c81530
|
navbar fixed on payment, order-success, order-confirmation
|
2017-08-03 02:35:44 +05:30 |
|
ARvind Tiwari
|
bfd621e98b
|
ssh_keys table updated
|
2017-08-03 01:27:29 +05:30 |
|
ARvind Tiwari
|
00ec5fb0db
|
code reformating
|
2017-08-03 00:59:05 +05:30 |
|
ARvind Tiwari
|
c8cf0bfba5
|
btn color on ssh_keys page
|
2017-08-03 00:50:27 +05:30 |
|
ARvind Tiwari
|
94e7039d8c
|
btn color fix
|
2017-08-03 00:24:27 +05:30 |
|
ARvind Tiwari
|
f4876c162f
|
btn color inverse
|
2017-08-03 00:22:25 +05:30 |
|
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
|
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 |
|
ARvind Tiwari
|
ede12cc624
|
Merge branch 'master' into bugfix/3621/mobile_signup
|
2017-07-31 20:47:27 +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
|
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
|
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 |
|
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
|
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 |
|
PCoder
|
f4aec68bfd
|
Added style to right align date in desktop view in Order Confirm page
|
2017-07-18 00:30:32 +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 |
|