Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9274cde
remove all blocking functions
comeonbuddy Dec 3, 2018
9316ccc
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 4, 2018
c0cf9ae
remove fuzz test related to manual blocking
comeonbuddy Dec 5, 2018
9c508f3
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 5, 2018
d6e5490
Merge branch 'dev-2.1.0' into remove-blocking-MATM
pabloruiz55 Dec 5, 2018
762f7b0
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 8, 2018
c5e70c1
CLI - Removed blocking functions
VictorVicente Dec 8, 2018
b894a0c
Updated permission document
VictorVicente Dec 8, 2018
f03b5f7
finished MATM function changes
comeonbuddy Dec 9, 2018
d59e9b1
Merge branch 'remove-blocking-MATM' of https://github.com/PolymathNet…
comeonbuddy Dec 9, 2018
a59e50e
improve the function definitions
SatyamSB Dec 10, 2018
75a1bdd
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 10, 2018
5d7263a
add missing return statement
SatyamSB Dec 10, 2018
46c9cdd
minor fix
SatyamSB Dec 10, 2018
0369cf3
MATM contract and test fixes
SatyamSB Dec 11, 2018
4fefd85
Merge branch 'dev-2.1.0' into remove-blocking-MATM
satyamakgec Dec 11, 2018
552de1b
minor fix
SatyamSB Dec 11, 2018
4956441
[WIP] CLI advances
shuffledex Dec 12, 2018
5e2ec74
Improve MATM to allow allowances and expiryTimes to be changed for ex…
shuffledex Dec 13, 2018
c8832cb
Refactoring and improvements
shuffledex Dec 13, 2018
002951b
Minor CLI changes
VictorVicente Dec 14, 2018
a10e0c0
fix modify batch
shuffledex Dec 14, 2018
22b6d45
manual merge
shuffledex Dec 14, 2018
4d48187
Improve menu string
shuffledex Dec 14, 2018
b53d904
CLI minor changes
VictorVicente Dec 14, 2018
09e8e4e
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 14, 2018
5e99a3a
Merge branch 'dev-2.1.0' into remove-blocking-MATM
maxsam4 Dec 18, 2018
ba851bf
Merge branch 'dev-2.1.0' into remove-blocking-MATM
VictorVicente Dec 21, 2018
5c14bcb
CLI typo fix
VictorVicente Dec 21, 2018
6dcef1f
fixed functions getActiveApprovalsToUser and added getAllApprovals() …
comeonbuddy Jan 2, 2019
bb3cdef
edited function description
comeonbuddy Jan 2, 2019
cad4562
CLI update
VictorVicente Jan 2, 2019
8737567
Merge branch 'dev-2.1.0' into remove-blocking-MATM
maxsam4 Jan 2, 2019
ad29c1b
test case fixed
maxsam4 Jan 2, 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
Prev Previous commit
Next Next commit
Merge branch 'dev-2.1.0' into remove-blocking-MATM
  • Loading branch information
VictorVicente authored Dec 21, 2018
commit ba851bf0c936eda7d07b57180621157e615c4a95
11 changes: 5 additions & 6 deletions CLI/commands/transfer_manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ const { table } = require('table')

///////////////////
// Constants
const WHITELIST_DATA_CSV = './CLI/data/Transfer/GTM/whitelist_data.csv';
const PERCENTAGE_WHITELIST_DATA_CSV = './CLI/data/Transfer/PercentageTM/whitelist_data.csv';
const ADD_MANUAL_APPROVAL_DATA_CSV = './CLI/data/Transfer/MATM/add_manualapproval_data.csv';
const MODIFY_MANUAL_APPROVAL_DATA_CSV = './CLI/data/Transfer/MATM/modify_manualapproval_data.csv';
const REVOKE_MANUAL_APPROVAL_DATA_CSV = './CLI/data/Transfer/MATM/revoke_manualapproval_data.csv';
const WHITELIST_DATA_CSV = `${__dirname}/../data/Transfer/GTM/whitelist_data.csv`;
const PERCENTAGE_WHITELIST_DATA_CSV = `${__dirname}/../data/Transfer/PercentageTM/whitelist_data.csv`;
const ADD_MANUAL_APPROVAL_DATA_CSV = `${__dirname}/../data/Transfer/MATM/add_manualapproval_data.csv`;
const MODIFY_MANUAL_APPROVAL_DATA_CSV = `${__dirname}/../data/Transfer/MATM/modify_manualapproval_data.csv`;
const REVOKE_MANUAL_APPROVAL_DATA_CSV = `${__dirname}/../data/Transfer/MATM/revoke_manualapproval_data.csv`;

const MATM_MENU_ADD = 'Add new manual approval';
const MATM_MENU_MANAGE = 'Manage existing approvals';
Expand All @@ -28,7 +28,6 @@ const MATM_MENU_OPERATE_ADD = 'Add multiple approvals in batch';
const MATM_MENU_OPERATE_MODIFY = 'Modify multiple approvals in batch';
const MATM_MENU_OPERATE_REVOKE = 'Revoke multiple approvals in batch';


// App flow
let tokenSymbol;
let securityToken;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.