Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

V20190326_0 #1360

Merged
merged 124 commits into from
Mar 26, 2019
Merged

V20190326_0 #1360

merged 124 commits into from
Mar 26, 2019

Conversation

ashkanx
Copy link
Contributor

@ashkanx ashkanx commented Mar 25, 2019

No description provided.

Aaron Imming added 30 commits February 26, 2019 16:48
Reset stats on summary.clear event
aa6e7dd
Create common showDialog() function
8850584
Move summary-toolbox to TradeInfoPanel, use React.Fragment as contain…
041b1c3 
…ing elem
Reset account stats on summary.clear
e398624
Reset TradeTable on summary.clear event
2563a7d
Add ClearButton to TradeInfoPanel, wrap RunButton+ClearButton in summ…
d614e0b 
…ary-toolbox
Use common showDialog() for some binds, add rules for (en|dis)abling …
ce06595 
…summaryClearButton
Refactor to use showDialog() function
5fff697
Clean up template, dialogs are now generated dynamically
88170f8
Add CSS rules for icon-clear
1911958
Add enabled & disabled clear svgs
6ec94b9
Create ClearButton
8408cf3
Position ClearButton
b679100
Update message
5a5cc9e
Restore setTimeout for cleanUp
5b49086
Clean up unused constants
89b0c5a
Filter n/a (sub)markets & symbols, implement logic for getting barrie…
0bcbe2a 
…rs + prediction from API, refactoring
Always initialise barrier offset + prediction fields
5c0fc94
Create common function for generating barriers, hide fields by default
9eb50e1
Combine getTradeType & getSelectedSymbol into common function
885b171
Move custom functions to customBlockly, add attachShadowBlock function
b8c3889
Remove custom blockly hooks, move them to customBlockly
1dbe490
Create hideInteractionsFromBlockly function
eb875ad
Refactor tradeOptions, show barrier offset, prediction, durations bas…
4285efb 
…ed on contracts_for response
package-lock.json
078c3aa
Default to smallest barriers if barriers based on duration could not …
9d5039b 
…be found
Maintain user-imported duration, but default to smallest duration on …
9e860b6 
…symbol-change
Add args to only change min duration in updateDurationLists args
2260532
Remove default duration value
07fa8fc
Add eslint exception
e89288e
ashkanx and others added 27 commits March 7, 2019 08:22
@ashkanx
Merge pull request #1247 from aaron-binary/from-constants-to-api
12c0f42 
From constants to API
@ashkanx
Merge pull request #1306 from binary-com/dev
4876515 
dev to beta
Merge branch 'dev' into amam/dependencies_vulnerabilty
d9ffb86
Add 'pull-blockly-translations' task
3616c8e
Create logic for pulling translations
13a4183
Update translation location to no longer use appspot
b43e844
Update package.json (gulp-remote-src) and package-lock.json
17ac692
@cakasuma
Merge branch 'dev' of https://github.com/binary-com/binary-bot into a…
f9505ca 
…mam/dependencies_vulnerabilty
@cakasuma
Merge branch 'amam/dependencies_vulnerabilty' of github.com:cakasuma/…
6d9f769 
…binary-bot into amam/dependencies_vulnerabilty
Merge pull request #1300 from cakasuma/amam/dependencies_vulnerabilty
9dddd4d 
update jest and es6 plato
@ashkanx
Merge branch 'dev' into local-blockly-translations
75d133d
@ashkanx
Merge pull request #1322 from aaron-binary/local-blockly-translations
d939c11 
Local blockly translations
@ashkanx
Merge pull request #1328 from binary-com/dev
89dd0d7 
dev to beta
@cakasuma
fix hostname
84f68bc
@ashkanx
Merge pull request #1329 from cakasuma/amam/fix_hostname
56376ec 
fix hostname
@ashkanx
Merge pull request #1330 from binary-com/dev
83d836d 
dev to beta
Fix function call in then
9fd5d4e
@ashkanx
Merge pull request #1342 from aaron-binary/show-correct-markets
7f316c0 
Show correct markets
@ashkanx
Merge pull request #1345 from binary-com/dev
63a560f 
dev to beta
Add GTM tags to index.mustache & build.mustache
fada97c
Add Only Ups/Only Downs contract type
5c127fb
Update test to accommodate new contract type
22605d0
@ashkanx
Merge pull request #1357 from aaron-binary/gtm
fd94952 
gtm
@ashkanx
Merge branch 'dev' into only-ups-only-downs
ad7fdb6
@ashkanx
Merge pull request #1358 from aaron-binary/only-ups-only-downs
f535415 
Add Only Ups/Only Downs contract type
@ashkanx
Merge pull request #1359 from binary-com/dev
e916ddf 
dev to beta
@ashkanx
Merge branch 'master' into beta
d7bbc14
@ashkanx ashkanx changed the title V20190325_0 V20190326_0 Mar 25, 2019
@coveralls
Copy link

coveralls commented Mar 25, 2019 •
edited
Loading

Coverage Status

Coverage increased (+0.05%) to 73.614% when pulling d7bbc14 on beta into 3150d6e on master.

@ashkanx ashkanx merged commit a6c28fa into master Mar 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ashkanx @coveralls @cakasuma