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

carol/ P2P: Email verification for orders #6299

Merged
merged 60 commits into from
Sep 8, 2022
Merged

carol/ P2P: Email verification for orders #6299

merged 60 commits into from
Sep 8, 2022

Commits on Apr 14, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    1eba58b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    086058c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    ba5e87e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed May 27, 2022
    Configuration menu
    Copy the full SHA
    95b8ec8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    a12090f View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 9, 2022
    Configuration menu
    Copy the full SHA
    d7d17cc View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    be7c7bb View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    f60d6c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f28f08d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    da2aaf6 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    6d9113c View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jul 4, 2022
    Configuration menu
    Copy the full SHA
    4244c91 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jul 7, 2022
    Configuration menu
    Copy the full SHA
    b3f8906 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    6f3aea9 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    cb70bf6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Merge branch 'master' of github.com:binary-com/deriv-app

    Carol Sachdeva committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    b39bc60 View commit details
    Browse the repository at this point in the history

  2. pull master

    Carol Sachdeva committed Aug 11, 2022
    Configuration menu
    Copy the full SHA
    7947c41 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Merge branch 'p2p-2fa-feature' of github.com:binary-com/deriv-app int… 

    …o email-verification
    Carol Sachdeva committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    47b96e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. fix: quotes

    Carol Sachdeva committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    aa2fa7a View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2022

  1. add: email verification

    Carol Sachdeva committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    ee369b5 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. fix: conflicts (finalllyyyyyyyyy)

    Carol Sachdeva committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    b1ec2e0 View commit details
    Browse the repository at this point in the history

  2. cleanup

    Carol Sachdeva committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    c6ab1d3 View commit details
    Browse the repository at this point in the history

  3. don't kill me

    Carol Sachdeva committed Aug 26, 2022
    Configuration menu
    Copy the full SHA
    a970958 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. add response checks

    Carol Sachdeva committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    ffbd0fb View commit details
    Browse the repository at this point in the history

  2. add comment

    Carol Sachdeva committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    39e65a4 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. add: amount + currency

    Carol Sachdeva committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    b71d0a1 View commit details
    Browse the repository at this point in the history

  2. fixed loading of order details and chat

    @farrah-deriv
    farrah-deriv committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    258eed8 View commit details
    Browse the repository at this point in the history

  3. fixed design on responsive

    @farrah-deriv
    farrah-deriv committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    86a1edd View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2022

  1. fix: conflicts

    Carol Sachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    f876093 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #60 from farrah-deriv/order-chat-fix 

    farrah/ fixed loading of order details and chat
    @carolsachdeva
    carolsachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    b61c49c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #61 from farrah-deriv/verification-modal-responsive 

    farrah/fixed verification modal design on responsive
    @carolsachdeva
    carolsachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    8b1eebb View commit details
    Browse the repository at this point in the history

  4. fixed verification modal in responsive

    @farrah-deriv
    farrah-deriv committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    ae5fbe0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #62 from farrah-deriv/scrollable-verification-modal 

    farrah/ Scrollable verification modal
    @carolsachdeva
    carolsachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    b2e6e16 View commit details
    Browse the repository at this point in the history

  6. show modal if error

    Carol Sachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    b00ea45 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'email-verification' of github.com:carol-binary/deriv-ap… 

    …p into email-verification
    Carol Sachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    0d76901 View commit details
    Browse the repository at this point in the history

  8. fix

    Carol Sachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    22c616f View commit details
    Browse the repository at this point in the history

  9. fixed truncated modal in ios

    @farrah-deriv
    farrah-deriv committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    7b6a28a View commit details
    Browse the repository at this point in the history

  10. Merge pull request #63 from farrah-deriv/email-verification-modal 

    farrah/fixed truncated email verification modal in ios
    @carolsachdeva
    carolsachdeva committed Sep 1, 2022
    Configuration menu
    Copy the full SHA
    59aa866 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. fix time

    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    d7fd8d0 View commit details
    Browse the repository at this point in the history

  2. fix invalid verification modal

    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    78e1062 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'email-verification' of github.com:carol-binary/deriv-ap… 

    …p into email-verification
    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    4c52cfc View commit details
    Browse the repository at this point in the history

  4. fix

    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    2fc9896 View commit details
    Browse the repository at this point in the history

  5. fix

    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    e6d6f03 View commit details
    Browse the repository at this point in the history

  6. fixed verification modal in desktop

    @farrah-deriv
    farrah-deriv committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    feb224f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #64 from farrah-deriv/verification-modal-desktop 

    farrah/fixed verification modal in desktop
    @carolsachdeva
    carolsachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    27b55a1 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'email-verification' of github.com:carol-binary/deriv-ap… 

    …p into email-verification
    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    368d364 View commit details
    Browse the repository at this point in the history

  9. fix responsive +logged out user

    Carol Sachdeva committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    d0c04c3 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. fixed a lot of stuff that broke lol

    Carol Sachdeva committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    531c055 View commit details
    Browse the repository at this point in the history

  2. fix: design for seller

    Carol Sachdeva committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    8b6c4a6 View commit details
    Browse the repository at this point in the history

  3. the solution to all my problems

    Carol Sachdeva committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    3453a68 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. fix: modal

    Carol Sachdeva committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    2c117fc View commit details
    Browse the repository at this point in the history

  2. fix logout + modal

    Carol Sachdeva committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    0ebded0 View commit details
    Browse the repository at this point in the history

  3. hide extra modal

    Carol Sachdeva committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    04f4d0e View commit details
    Browse the repository at this point in the history

  4. i got 99 problems and 2fa is all of em

    Carol Sachdeva committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    28dfc51 View commit details
    Browse the repository at this point in the history

  5. fix

    Carol Sachdeva committed Sep 6, 2022
    Configuration menu
    Copy the full SHA
    fb5cd3e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. fix

    Carol Sachdeva committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    1a23f9f View commit details
    Browse the repository at this point in the history

  2. fix: amount

    Carol Sachdeva committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    0d3b576 View commit details
    Browse the repository at this point in the history

  3. fix: amount

    Carol Sachdeva committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    9d48faa View commit details
    Browse the repository at this point in the history

  4. fix: add modal

    Carol Sachdeva committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    0eeac0e View commit details
    Browse the repository at this point in the history

  5. fix: rating modal

    Carol Sachdeva committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    1b106a4 View commit details
    Browse the repository at this point in the history