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 |
|
Arvind Tiwari
|
c87e2cd36b
|
hosting settings url, view and template added
|
2017-08-24 20:28:02 +05:30 |
|
Arvind Tiwari
|
23bf602a16
|
merged master, fixed translation
|
2017-08-24 20:16:26 +05:30 |
|
Arvind Tiwari
|
cfb1a303a1
|
new icons
|
2017-08-24 19:56:30 +05:30 |
|
M.Ravi
|
5e26d6df04
|
Simplified text -> You are not making payment + translation
|
2017-08-24 13:18:59 +02:00 |
|
M.Ravi
|
f32494af2f
|
hosting po file: Removed fuzzy for a text
|
2017-08-24 13:05:26 +02:00 |
|
M.Ravi
|
60df9a888c
|
Added translation for month
|
2017-08-24 12:48:30 +02:00 |
|
PCoder
|
f2b0ff04ca
|
Added text and styles for monthly payment clarification
|
2017-08-24 13:41:48 +05:30 |
|
PCoder
|
ebff2cbd94
|
hosting/payment.html: Added /month text and adjusted width
|
2017-08-24 12:55:22 +05:30 |
|
PCoder
|
2ae88ae287
|
Added style for /month text
|
2017-08-24 12:54:12 +05:30 |
|
PCoder
|
75da4a7711
|
hosting/models.py: Fixed bug extracting cc info from dict
|
2017-08-24 12:51:55 +05:30 |
|
PCoder
|
7c3a0b86d8
|
HostingOrder: Updated set_subscription_id to include cc details as parameter
|
2017-08-24 11:59:38 +05:30 |
|
PCoder
|
a964f2fb5b
|
Merged master into task/3701/enable_monthly_payments
|
2017-08-24 04:06:48 +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 |
|
Pcoder
|
a77b7b0ab5
|
Merge pull request #460 from pcoder/add_test_create_vm_celery_task
Added test for create vm celery task
|
2017-08-23 23:24:49 +02:00 |
|
PCoder
|
6484684ac5
|
Removed unncessary check for error for make_charge
|
2017-08-24 02:29:24 +05:30 |
|
Arvind Tiwari
|
738e4fc93f
|
removed duplicate for "See Invoice"
|
2017-08-24 01:07:20 +05:30 |
|
Arvind Tiwari
|
30551e5ac5
|
merged master
|
2017-08-24 00:59:17 +05:30 |
|
Arvind Tiwari
|
04d7a2b076
|
removed fuzzy
|
2017-08-24 00:48:07 +05:30 |
|
Arvind Tiwari
|
fc0ed90447
|
background and margin fix
|
2017-08-24 00:39:47 +05:30 |
|
Arvind Tiwari
|
ab4e7feedd
|
Merge pull request #442 from tiwariav/bugfix/3645/modal-show
Bugfix/3645 navbar movement on modal show/hide
|
2017-08-24 00:34:14 +05:30 |
|
Arvind Tiwari
|
f1f166b798
|
Ihre virtuelle Maschine beenden -> Deine Virtuelle Maschine beenden
|
2017-08-24 00:13:03 +05:30 |
|
Arvind Tiwari
|
4cf6df64a8
|
btn link fixed
|
2017-08-23 23:59:18 +05:30 |
|
Arvind Tiwari
|
17be01370b
|
removed test url
|
2017-08-23 23:52:09 +05:30 |
|
Arvind Tiwari
|
a2dd55cf16
|
padding adjusted
|
2017-08-23 23:49:29 +05:30 |
|
Arvind Tiwari
|
4179d622aa
|
changed border color for error input
|
2017-08-23 23:46:59 +05:30 |
|
Arvind Tiwari
|
78c9931002
|
mobile view buttons shifted below
|
2017-08-23 23:31:06 +05:30 |
|
Arvind Tiwari
|
788621bd2b
|
test markup removed
|
2017-08-23 23:07:40 +05:30 |
|
Arvind Tiwari
|
e6e0bea9b4
|
increased padding
|
2017-08-23 21:55:29 +05:30 |
|
Arvind Tiwari
|
302f17a3d3
|
increased padding
|
2017-08-23 21:52:23 +05:30 |
|
Arvind Tiwari
|
e50baf50e8
|
increased padding
|
2017-08-23 21:51:56 +05:30 |
|
Arvind Tiwari
|
67362b5466
|
increase width
|
2017-08-23 21:09:56 +05:30 |
|
Arvind Tiwari
|
9257f73739
|
ipv6 line break
|
2017-08-23 21:07:35 +05:30 |
|
Arvind Tiwari
|
e912acd3ca
|
increase max-width for page contents
|
2017-08-23 21:04:14 +05:30 |
|
Arvind Tiwari
|
4c23d2bd30
|
contact box, line break
|
2017-08-23 19:42:49 +05:30 |
|
Arvind Tiwari
|
e15cf7e164
|
translation fix
|
2017-08-23 19:35:23 +05:30 |
|
Arvind Tiwari
|
0cac35831a
|
code cleanup, translations fix
|
2017-08-23 19:22:59 +05:30 |
|
Arvind Tiwari
|
27a233ffc4
|
translations added
|
2017-08-23 18:14:33 +05:30 |
|
Arvind Tiwari
|
9bbcd1b9ab
|
translations compiled
|
2017-08-22 21:40:40 +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
|
d8b76abda2
|
translations fixed
|
2017-08-21 23:41:38 +05:30 |
|
Arvind Tiwari
|
a0d5b4d04f
|
removed Lato font files from web server, and its usage from css files
|
2017-08-21 23:35:17 +05:30 |
|
PCoder
|
29d36faef0
|
Refactored some code
|
2017-08-21 00:41:46 +05:30 |
|
PCoder
|
7def893028
|
Merged origin/master into task/3701/enable_monthly_payments
|
2017-08-21 00:27:44 +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 |
|
PCoder
|
38fa18b2be
|
Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow
|
2017-08-20 17:31:59 +05:30 |
|
Arvind Tiwari
|
4684d87c5c
|
translation fixes
|
2017-08-20 03:42:09 +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
|
e7708f5652
|
active menu bug fix
|
2017-08-20 02:21:02 +05:30 |
|
Arvind Tiwari
|
8daf260748
|
dropdown style changed to match landing page style
|
2017-08-20 01:51:28 +05:30 |
|
Arvind Tiwari
|
65ac2df002
|
dropdown style changed to match landing page style
|
2017-08-20 01:46:26 +05:30 |
|
PCoder
|
69f5aea560
|
Merge branch 'master' into task/3622/decouple_opennebula_dcl_flow
|
2017-08-20 01:39:12 +05:30 |
|
PCoder
|
9a0592ec4b
|
Merge branch 'master' into task/3701/enable_monthly_payments
|
2017-08-20 01:36:45 +05:30 |
|
Arvind Tiwari
|
b0cdd684e8
|
removed duplicate highlights button
|
2017-08-20 00:51:21 +05:30 |
|
Arvind Tiwari
|
308cb558a3
|
removed debug.log, fixed translation
|
2017-08-20 00:34:22 +05:30 |
|
Arvind Tiwari
|
6764e1ccee
|
Merge pull request #441 from tiwariav/task/3565/warning-color
task/3565 override bootstrap default danger color #a94442 -> #eb4d5c
|
2017-08-20 00:29:21 +05:30 |
|
PCoder
|
6b7ae88f74
|
Merged master into task/3622/decouple_opennebula_dcl_flow
|
2017-08-19 03:24:22 +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
|
752e5f53d8
|
translations
|
2017-08-19 00:02:12 +05:30 |
|
Arvind Tiwari
|
3dc41edefb
|
mobile border glitch solved
|
2017-08-18 23:51:27 +05:30 |
|
Arvind Tiwari
|
5e5e33ce70
|
alignment and last item border
|
2017-08-18 23:27:57 +05:30 |
|
PCoder
|
35736ae593
|
Refactored some code
|
2017-08-18 01:49:27 +05:30 |
|
PCoder
|
fc70c30f21
|
Merged master into task/3701/enable_monthly_payments
|
2017-08-18 00:40: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 |
|
M.Ravi
|
3445579a8e
|
Added 0042_hostingorder_subscription_id.py migration file
|
2017-08-17 18:36:14 +02:00 |
|
M.Ravi
|
ecbbe1eb6d
|
Added subscription_id field and reformatted the code
|
2017-08-17 18:16:36 +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
|
07f92e754e
|
fix for mobile
|
2017-08-12 01:18:14 +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
|
4ab26b4bbd
|
Merge pull request #440 from tiwariav/task/3619/lato-font
Task/3619 Lato font used in all stylesheets
|
2017-08-12 00:42:37 +05:30 |
|
Arvind Tiwari
|
415c914982
|
Merge pull request #439 from pcoder/task/3655/check_authorization_delete_ssh_keys
Task/3655/Check authorization for delete ssh keys
|
2017-08-12 00:42:08 +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
|
789946ff77
|
conditions for adjusting padding fixed
|
2017-08-09 01:32:41 +05:30 |
|
ARvind Tiwari
|
7bde3149f5
|
adjust padding on fixed .topnav on modal show/hide, to remove the movement
|
2017-08-09 01:26:02 +05:30 |
|
ARvind Tiwari
|
7cf46ad8b8
|
override bootstrap default danger color #a94442 -> #eb4d5c
|
2017-08-09 00:21:25 +05:30 |
|
ARvind Tiwari
|
ac0787bdd5
|
modal title font-weight and capitalization fix
|
2017-08-08 23:01:19 +05:30 |
|
Pcoder
|
34a95f5a05
|
Merge pull request #433 from pcoder/bug/3638/ssh_key_without_download_option
Bug/3638/ssh key without download option
|
2017-08-08 00:20:47 +02:00 |
|
ARvind Tiwari
|
cc58c49457
|
font-weight fix in hosting app
|
2017-08-08 00:51:54 +05:30 |
|
ARvind Tiwari
|
6c4e0067ba
|
font-family changed to 'Lato' in all css files
|
2017-08-08 00:35:58 +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 |
|
M.Ravi
|
55177646b4
|
Reformatted code
|
2017-08-06 16:33:37 +02:00 |
|
PCoder
|
1d4f86da14
|
Added translation for Delete SSH Key
|
2017-08-05 00:01:19 +05:30 |
|
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 |
|
M.Ravi
|
d85afd56e0
|
Fixed an issue
- Changed owner -> user
- Reformatted code
|
2017-08-04 17:49:55 +02:00 |
|
PCoder
|
c6b23f6aa0
|
Added get_object method to verify if the user is the owner of the ssh key
|
2017-08-04 20:54:28 +05:30 |
|
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
|
6175cf9617
|
Merge branch 'master' into bug/3638/ssh_key_without_download_option
|
2017-08-04 02:29:20 +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 |
|
PCoder
|
23b927f7fb
|
Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option
|
2017-08-04 02:07:25 +05:30 |
|
ARvind Tiwari
|
3560eede37
|
ssh list modal and table paddings
|
2017-08-04 02:05:27 +05:30 |
|
PCoder
|
0fa4c0ac94
|
Merge branch 'task/3620/ssh_keys' of https://github.com/tiwariav/dynamicweb into bug/3638/ssh_key_without_download_option
|
2017-08-04 01:45:55 +05:30 |
|
ARvind Tiwari
|
e3c62a99b5
|
shadow on navbar
|
2017-08-04 01:17:12 +05:30 |
|
Pcoder
|
0adc24c13a
|
Merge pull request #423 from tiwariav/bugfix/3408/login_image
new background image for login/signup
|
2017-08-03 21:45:08 +02:00 |
|
ARvind Tiwari
|
111df859dd
|
background color for nav active item changed to transparent
|
2017-08-04 00:54:36 +05:30 |
|
ARvind Tiwari
|
4890a8d4f3
|
background color for nav active item changed to transparent
|
2017-08-04 00:42:34 +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
|
6d2a6b6045
|
removed unused img file
|
2017-08-03 23:52:46 +05:30 |
|
ARvind Tiwari
|
87dc273c4b
|
bootstrap file changed to default
|
2017-08-03 23:27:42 +05:30 |
|
ARvind Tiwari
|
a86224f566
|
translation fix
|
2017-08-03 23:26:09 +05:30 |
|
ARvind Tiwari
|
8edbd29fad
|
navbar made white, dropdown fix
|
2017-08-03 23:18:58 +05:30 |
|
ARvind Tiwari
|
3b575b47e2
|
navbar right margin
|
2017-08-03 22:28:20 +05:30 |
|
ARvind Tiwari
|
0993d8c106
|
reviewed changes
|
2017-08-03 22:00:41 +05:30 |
|
M.Ravi
|
60d107baee
|
Improved the condition about when to generate ssh keys
|
2017-08-03 15:07:36 +02:00 |
|
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
|
4bd34b56d1
|
fixes for mobile
|
2017-08-03 00:20:20 +05:30 |
|