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

zaki/markets_trade_types_toolip_popover #4

Merged
merged 65 commits into from
Jun 16, 2019
Merged

zaki/markets_trade_types_toolip_popover #4

merged 65 commits into from
Jun 16, 2019

Commits on May 28, 2019

  1. split result details into contract-audit and move styling from result… 

    … details to contract-audit sass file
    @zaki-hanafiah
    zaki-hanafiah committed May 28, 2019
    Configuration menu
    Copy the full SHA
    81264d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 28, 2019
    Configuration menu
    Copy the full SHA
    c6dc1dc View commit details
    Browse the repository at this point in the history

  3. split contract audit from contract card

    @zaki-hanafiah
    zaki-hanafiah committed May 28, 2019
    Configuration menu
    Copy the full SHA
    d8f173c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. cleanup contract store on account switch from 404 contract, explicitl… 

    …y redirect react router to reports in go back to reports
    @oskar-binary
    oskar-binary committed May 29, 2019
    Configuration menu
    Copy the full SHA
    f39b911 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:binary-com/deriv-app into oskar/hand… 

    …le_404_account_switch
    @oskar-binary
    oskar-binary committed May 29, 2019
    Configuration menu
    Copy the full SHA
    c59bf40 View commit details
    Browse the repository at this point in the history

  3. update location check 

    Update string check and import order
    @oskar-binary
    oskar-binary committed May 29, 2019
    Configuration menu
    Copy the full SHA
    2cdfbc2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 29, 2019
    Configuration menu
    Copy the full SHA
    9e6607d View commit details
    Browse the repository at this point in the history

  5. updated contract item grid layout, added entry and exit spot times

    @zaki-hanafiah
    zaki-hanafiah committed May 29, 2019
    Configuration menu
    Copy the full SHA
    eba15f5 View commit details
    Browse the repository at this point in the history

  6. redirect to trade if switch account from ErrorComponent

    @oskar-binary
    oskar-binary committed May 29, 2019
    Configuration menu
    Copy the full SHA
    fee6f52 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of github.com:binary-com/deriv-app into oskar/hand… 

    …le_404_account_switch
    @oskar-binary
    oskar-binary committed May 29, 2019
    Configuration menu
    Copy the full SHA
    4be80c5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 29, 2019
    Configuration menu
    Copy the full SHA
    bc5c54d View commit details
    Browse the repository at this point in the history

  9. update contract audit details layout

    @zaki-hanafiah
    zaki-hanafiah committed May 29, 2019
    Configuration menu
    Copy the full SHA
    0223fa6 View commit details
    Browse the repository at this point in the history

  10. ass hotjar whitelist

    @nazaninreihani
    nazaninreihani committed May 29, 2019
    Configuration menu
    Copy the full SHA
    ab60ad7 View commit details
    Browse the repository at this point in the history

  11. add hotjar whitelist to smartchart components

    @nazaninreihani
    nazaninreihani committed May 29, 2019
    Configuration menu
    Copy the full SHA
    86ef7b0 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. clear error_message on account switch, remount contract-replay on acc… 

    …ount switch
    @oskar-binary
    oskar-binary committed May 30, 2019
    Configuration menu
    Copy the full SHA
    21d488c View commit details
    Browse the repository at this point in the history

  2. remove withrouter from acc-switcher

    @oskar-binary
    oskar-binary committed May 30, 2019
    Configuration menu
    Copy the full SHA
    94b016b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of github.com:binary-com/deriv-app into oskar/hand… 

    …le_404_account_switch
    @oskar-binary
    oskar-binary committed May 30, 2019
    Configuration menu
    Copy the full SHA
    76cdc5c View commit details
    Browse the repository at this point in the history

  4. remove forgetting poc if error response, style fixes

    @oskar-binary
    oskar-binary committed May 30, 2019
    Configuration menu
    Copy the full SHA
    d298c0f View commit details
    Browse the repository at this point in the history

  5. refactored icons for contract audit, updated clickHandler for result … 

    …overlay when contract is unsupported, update style for positions drawer card and result overlay
    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    df59d78 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    f6d46e6 View commit details
    Browse the repository at this point in the history

  7. update contract drawer styles

    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    99c7846 View commit details
    Browse the repository at this point in the history

  8. updated contract drawer details

    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    2f7900a View commit details
    Browse the repository at this point in the history

  9. fixed position drawer, enabled go to reports button in contract mode

    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    85c565f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    5604d52 View commit details
    Browse the repository at this point in the history

  11. reverted changes

    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    f5ff455 View commit details
    Browse the repository at this point in the history

  12. refactoring result overlay, added compromise workaround for chartList… 

    …ener sending false positive for chartListener status
    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    e2fdf78 View commit details
    Browse the repository at this point in the history

  13. disable purchase button in contract mode and update disabled styling

    @zaki-hanafiah
    zaki-hanafiah committed May 30, 2019
    Configuration menu
    Copy the full SHA
    eb5110f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. refactoring

    @zaki-hanafiah
    zaki-hanafiah committed May 31, 2019
    Configuration menu
    Copy the full SHA
    7a10bb4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed May 31, 2019
    Configuration menu
    Copy the full SHA
    0c4b52e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2019

  1. set max width and nowrap for labels in position and contract drawer c… 

    …ards
    @zaki-hanafiah
    zaki-hanafiah committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    567ebff View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. Merge branch 'dev' into contract_details_update

    @ashkanx
    ashkanx authored Jun 4, 2019
    Configuration menu
    Copy the full SHA
    37ac749 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2019

  1. remove trade parameters merge

    @arash-fs
    arash-fs committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    ae32ceb View commit details
    Browse the repository at this point in the history

  2. change detecting favorite market

    @arash-fs
    arash-fs committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    366242b View commit details
    Browse the repository at this point in the history

  3. change the default pick symbol

    @arash-fs
    arash-fs committed Jun 9, 2019
    Configuration menu
    Copy the full SHA
    129305f View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2019

  1. resolve a bunch of icon conflicts

    @zaki-hanafiah
    zaki-hanafiah committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    76436e9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'contract_details_update' of github.com:zakibinary/deriv… 

    …-app into contract_details_update
    @zaki-hanafiah
    zaki-hanafiah committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    17fc655 View commit details
    Browse the repository at this point in the history

  3. refactoring and fixing QA bugs for unsupported contracts and missing … 

    …icons in light theme
    @zaki-hanafiah
    zaki-hanafiah committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    baa2226 View commit details
    Browse the repository at this point in the history

  4. fixes for crypto profit loss style

    @zaki-hanafiah
    zaki-hanafiah committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    ad40a54 View commit details
    Browse the repository at this point in the history

  5. fix money test

    @zaki-hanafiah
    zaki-hanafiah committed Jun 11, 2019
    Configuration menu
    Copy the full SHA
    52a3279 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2019

  1. send userId

    @negar-binary
    negar-binary committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    31f7ae5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into oskar/handle_404_account_switch

    @negarn
    negarn authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    59072f7 View commit details
    Browse the repository at this point in the history

  3. add handler from oskar pr to for handling back to reports button

    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    2eac487 View commit details
    Browse the repository at this point in the history

  4. Merge pull request deriv-com#114 from OskarAhl/oskar/handle_404_accou… 

    …nt_switch

oskar/handle_404_account_switch
    @negarn
    negarn authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    ec9b0db View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into default-symbol-weekends

    @negarn
    negarn authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    f87c936 View commit details
    Browse the repository at this point in the history

  6. Merge pull request deriv-com#47 from arash-binary/default-symbol-week… 

    …ends

arash/default to volatility indices on weekends
    @negarn
    negarn authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    4dad86e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into hotjar

    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    80a0dc8 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' into negar/add_user_id

    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    35468f5 View commit details
    Browse the repository at this point in the history

  9. Merge pull request deriv-com#151 from negarn/negar/add_user_id 

    negar/add_user_id
    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    0be6200 View commit details
    Browse the repository at this point in the history

  10. Fix date picker click issue

    @arash-fs
    arash-fs committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    1735d95 View commit details
    Browse the repository at this point in the history

  11. updated icons, changed label to exit_time for all contracts

    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    ab49117 View commit details
    Browse the repository at this point in the history

  12. optimized icons

    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    a635394 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'dev' into contract_details_update

    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    71903bb View commit details
    Browse the repository at this point in the history

  14. Merge branch 'dev' into date-picker

    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    0498dd9 View commit details
    Browse the repository at this point in the history

  15. Merge pull request deriv-com#152 from arash-binary/date-picker 

    arash/DatePicker not working on deriv
    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    01f5a95 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'dev' of github.com:binary-com/deriv-app into contract_d… 

    …etails_update
    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    170fbbd View commit details
    Browse the repository at this point in the history

  17. Merge branch 'contract_details_update' of github.com:zakibinary/deriv… 

    …-app into contract_details_update
    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    432d600 View commit details
    Browse the repository at this point in the history

  18. fix duplicate import

    @zaki-hanafiah
    zaki-hanafiah committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    0655b91 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'dev' into hotjar

    @nazaninreihani
    nazaninreihani authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    8beb269 View commit details
    Browse the repository at this point in the history

  20. fix eslint error

    @nazaninreihani
    nazaninreihani committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    0397d21 View commit details
    Browse the repository at this point in the history

  21. Merge pull request deriv-com#122 from nazaninreihani/hotjar 

    hotjar - whitelist some inputs
    @ashkanx
    ashkanx authored Jun 12, 2019
    Configuration menu
    Copy the full SHA
    66f01af View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2019

  1. Merge branch 'dev' into contract_details_update

    @negarn
    negarn authored Jun 13, 2019
    Configuration menu
    Copy the full SHA
    eec8378 View commit details
    Browse the repository at this point in the history

  2. Merge pull request deriv-com#124 from zakibinary/contract_details_update 

    zaki/update_contract_audit_design
    @negarn
    negarn authored Jun 13, 2019
    Configuration menu
    Copy the full SHA
    5bc783d View commit details
    Browse the repository at this point in the history

  3. resolve conflict

    @zaki-hanafiah
    zaki-hanafiah committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    b73024f View commit details
    Browse the repository at this point in the history

  4. fix underwhyling typo

    @zaki-hanafiah
    zaki-hanafiah committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    f3e9665 View commit details
    Browse the repository at this point in the history

  5. popover fest time

    @zaki-hanafiah
    zaki-hanafiah committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    43ed09b View commit details
    Browse the repository at this point in the history