Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev-2.1.0 to master #627

Merged
merged 842 commits into from
Apr 5, 2019
Merged

Dev-2.1.0 to master #627

merged 842 commits into from
Apr 5, 2019

Conversation

satyamakgec
Copy link
Contributor

Keeping as Draft PR as we did not get the sign-off from the auditors on VRTM.

maxsam4 and others added 30 commits December 13, 2018 20:09
@maxsam4
Combine travis and CircleCI
1e81411
@maxsam4
env var changes
a89562c
@maxsam4
comment
742cdad
@shuffledex
Improve MATM to allow allowances and expiryTimes to be changed for ex…
5e2ec74 
…isting approvals
@VictorVicente
Merge branch 'dev-2.1.0' into reinvent-lockup
4ebc150
@shuffledex
Refactoring and improvements
c8832cb
@VictorVicente
CLI - Operations in batch for VRTM
125c1b8
@comeonbuddy
fuzz test for adding and removing modules
4c92fce
@maxsam4
Merge pull request #468 from maxsam4/circle-ci
6cde94f 
Circle ci
@maxsam4
Merge branch 'dev-2.1.0' into circle-ci
5c66795
@comeonbuddy
finished module fuzz test
bea3115
@maxsam4 @adamdossa
Fix rounding off errors (#467)
06ce332 
* Fixed rounding off errors

* Increased tolerance

* Reduced tolerance to zero

* Comment updated

* Tolerance set to 2
@VictorVicente
Minor CLI changes
002951b
@adamdossa
Merge branch 'dev-2.1.0' into development-1.5.1
d1d982c
@shuffledex
fix modify batch
a10e0c0
@maxsam4
Increased no o/p timeout
4c40494
@shuffledex
manual merge
22b6d45
@maxsam4
Merge branch 'dev-2.1.0' into circle-ci
bdf3c61
@shuffledex
Improve menu string
4d48187
@maxsam4
Triggering CircleCI
115f3b1
@VictorVicente
CLI minor changes
b53d904
@VictorVicente
Merge branch 'dev-2.1.0' into remove-blocking-MATM
09e8e4e
@pabloruiz55
Merge pull request #463 from PolymathNetwork/circle-ci
03ee41f 
Adding Circle CI to dev-2.1.0
@adamdossa
Add ability to see excluded addresses
cbd2f57
@adamdossa
Updates
c0f5594
@adamdossa
Fixes
5574125
@adamdossa
Bump excluded limit to 150
b01b826
@satyamakgec
Merge branch 'dev-2.1.0' into fuzz-test-adding-removing-modules
46afc1f
@SatyamSB
remove SRVTM
fe306e0
@adamdossa
Merge branch 'dev-2.1.0' into dividend_exclusion
8df6319
pabloruiz55 and others added 20 commits March 21, 2019 09:04
@pabloruiz55
Merge branch 'dev-2.1.0' into cli-dividend-fixes
bb59d5d
@VictorVicente
Version info for all modules
a5b6c32
@pabloruiz55
Merge pull request #613 from PolymathNetwork/cli-dividend-fixes
923926e 
[CLI] Dividend fixes
@SatyamSB
audit fixes 1..9
c4afe28
@SatyamSB
add test cases for the major issue
95e7b2c
@SatyamSB
test fix
de6decc
@SatyamSB
improve the test run
1191f38
@SatyamSB
add the startTime == 0 check
60b2aa0
@SatyamSB
resolve the edge case when the investors restriction changes
031f5dd
@maxsam4
Minor change
3672305
@maxsam4
VRTM size reduction to 24.21KB
6aba6b9
@maxsam4
Reduced VRTM size to be under the limit
5a2231a
@SatyamSB
add the code comments
7309dcb
@SatyamSB
increase the time to fix the coverage
4c43cf5
@SatyamSB
optimize the code
8d87605
@satyamakgec
Merge pull request #617 from PolymathNetwork/vrtm-audit-fixes
bed595d 
VRTM audit fixes
@pabloruiz55
updated readme with 2.1.0 mainnet addresses
c4b537d
@VictorVicente
Fix to keep transfer_manager compatible with GTM v1.0.0
5b4f429
@pabloruiz55
Merge pull request #626 from PolymathNetwork/CLI-gtm-multiversion
bba2546 
[CLI] Keep transfer_manager compatible with GTM v1.0.0
@SatyamSB
merge dev-2.1.0 to master
3409ff9
@satyamakgec satyamakgec marked this pull request as ready for review April 3, 2019 12:57
@satyamakgec satyamakgec changed the title Dev-2.1.0 to master [WIP]: Dev-2.1.0 to master Apr 3, 2019
@satyamakgec satyamakgec changed the title [WIP]: Dev-2.1.0 to master Dev-2.1.0 to master Apr 5, 2019
@coveralls
Copy link

Coverage Status

Coverage decreased (-1.7%) to 97.085% when pulling 6470391 on dev2-to-master into 28a77af on master.

@pabloruiz55 pabloruiz55 merged commit 236e2a3 into master Apr 5, 2019
@satyamakgec satyamakgec deleted the dev2-to-master branch October 30, 2019 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxsam4 maxsam4 maxsam4 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.