Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e6f7bee
add message
cakasuma Apr 17, 2019
d28f0a9
fix it l undefined
cakasuma Apr 17, 2019
a6e2754
add styling
cakasuma Apr 18, 2019
3e3ec4e
change to scss
cakasuma Apr 18, 2019
4d18a4a
finish structure and design
cakasuma Apr 18, 2019
74dd3ed
fix exclude until bug
cakasuma Apr 18, 2019
7bff6ce
fix website status issue and refresh on update
cakasuma Apr 18, 2019
effafce
New translations messages.pot (Italian)
ashkanx Apr 19, 2019
b3577af
New translations messages.pot (Italian)
ashkanx Apr 19, 2019
6c7f404
upgrade dependencies
cakasuma Apr 19, 2019
1f50e01
prolong the message display
cakasuma Apr 19, 2019
d5c3586
New translations messages.pot (Italian)
ashkanx Apr 22, 2019
039656b
Merge pull request #1439 from cakasuma/amam/update_dependencies2
ashkanx Apr 22, 2019
ad62dc7
resolve conflicts
cakasuma Apr 22, 2019
876bbdc
fixed growl
cakasuma Apr 22, 2019
7e2e1a9
add deploy branch script
cakasuma Apr 22, 2019
998c4af
add getcountry status
cakasuma Apr 22, 2019
be6557a
Merge pull request #1437 from cakasuma/amam/self_exclusion
ashkanx Apr 22, 2019
d668b2f
New translations messages.pot (Chinese Simplified)
ashkanx Apr 25, 2019
b575671
New translations messages.pot (Chinese Traditional)
ashkanx Apr 25, 2019
b751a4f
change send to cached send
cakasuma Apr 29, 2019
0657e6c
Merge branch 'development' of https://github.com/binary-com/webtrader…
cakasuma Apr 29, 2019
0910cc2
update node-sass
cakasuma Apr 30, 2019
98b5fd6
tostring handler
cakasuma May 2, 2019
289344a
remove unnecessary cache
cakasuma May 3, 2019
419be8e
cache active symbols refresh
cakasuma May 3, 2019
5197a8e
remove sell cached
cakasuma May 3, 2019
e29348e
remove unnecessary cached
cakasuma May 3, 2019
6627932
remove contractfor cached
cakasuma May 3, 2019
aefc67c
remove tick history request
cakasuma May 6, 2019
efbf184
Merge pull request #1442 from cakasuma/amam/chached_liveapi
ashkanx May 7, 2019
585e39f
fix dependencies
cakasuma May 7, 2019
33d0ef3
Merge pull request #1444 from cakasuma/amam/update_dependencies_2
oskar-binary May 7, 2019
871fa22
Merge pull request #1443 from cakasuma/amam/check_return_api
ashkanx May 8, 2019
ea0971d
Merge pull request #1445 from binary-com/master
ashkanx May 8, 2019
19b0c89
Revert "V20190508_0"
ashkanx May 8, 2019
694fcb0
Merge pull request #1447 from binary-com/revert-1445-master
ashkanx May 8, 2019
baf2e8b
Merge pull request #1438 from binary-com/CrowdIn
ashkanx May 8, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 82 additions & 62 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"babel-preset-stage-0": "^6.5.0",
"concurrently": "^3.3.0",
"connect": "^3.6.1",
"grunt": "^1.0.1",
"grunt": "^1.0.4",
"grunt-babel": "^6.0.0",
"grunt-bump": "^0.3.0",
"grunt-cli": "^1.2.0",
Expand All @@ -39,9 +39,10 @@
"grunt-shell": "^1.1.2",
"grunt-text-replace": "^0.4.0",
"lodash": "^4.17.5",
"node-sass": "^4.11.0"
"node-sass": "^4.12.0"
},
"scripts": {
"deploy-branch": "grunt deploy-branch",
"deploy-gh-pages": "grunt deploy",
"start": "grunt && concurrently -k \"grunt watch\" \"grunt connect\"",
"watch": "grunt watch",
Expand Down Expand Up @@ -80,7 +81,7 @@
"datatables.net-jqui": "^1.10.15",
"es6-promise": "^4.1.1",
"highstock-release": "^5.0.10",
"jquery": "^3.2.1",
"jquery": "^3.4.1",
"jquery-sparkline": "^2.4.0",
"jquery-ui-dist": "1.12.0",
"jquery-ui-iconfont": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/accountstatus/accountstatus.es6
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class AccountStatus {
return Promise.all([
liveapi.send({ get_account_status: 1 }),
liveapi.cached.send({ website_status: 1 }),
liveapi.send({ 'get_settings': 1 }),
liveapi.cached.send({ 'get_settings': 1 }),
liveapi.cached.send({ get_financial_assessment: 1 }),
liveapi.send({ mt5_login_list: 1 })
]);
Expand Down
2 changes: 1 addition & 1 deletion src/cashier/deposit.es6
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function init_state(root) {
});

/* get the residence field and its states */
var residence_promise = liveapi.send({ get_settings: 1 })
var residence_promise = liveapi.cached.send({ get_settings: 1 })
.then(function(data) {
state.user.residence = data.get_settings.country_code;
state.user.residence_name = data.get_settings.country;
Expand Down
3 changes: 1 addition & 2 deletions src/cashier/withdraw.es6
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ class Withdraw {

transfer.submit = () => {
if (transfer.account === '' || transfer.amount === '') {
console.log(transfer);
empty_fields.show();
return;
}
Expand Down Expand Up @@ -344,7 +343,7 @@ class Withdraw {
}
}

liveapi.send({ get_settings: 1 })
liveapi.cached.send({ get_settings: 1 })
.then(data => {
agent.residence = data.get_settings.country_code;
const currency = local_storage.get('currency');
Expand Down
1 change: 1 addition & 0 deletions src/copytrade/copytrade.es6
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ const initConfigWindow = () => {
state.allowCopy.allow_copiers = 0;
} else {
liveapi
.cached
.send({ get_settings: 1 })
.then((settings) => {
state.is_loading = false;
Expand Down
1 change: 1 addition & 0 deletions src/instruments/instruments.es6
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import "common/util";

function refresh_active_symbols() {
liveapi
.cached
.send({ active_symbols: 'brief' })
.then(function(data) {
local_storage.set('active_symbols', data.active_symbols);
Expand Down
44 changes: 0 additions & 44 deletions src/selfexclusion/selfexclusion.css

This file was deleted.

Loading