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

[MM-56695] Consolidate desktop and mobile Notifications to one and a new desktop notification sound settings #26198

Merged
merged 50 commits into from
Apr 8, 2024
Merged

[MM-56695] Consolidate desktop and mobile Notifications to one and a new desktop notification sound settings #26198

merged 50 commits into from
Apr 8, 2024
+2,251 −2,636

Commits on Feb 11, 2024

  1. move

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    f130155 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. mobile header and desktop header

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    8b9a8aa View commit details
    Browse the repository at this point in the history

  2. Update user_settings_notifications.tsx

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    d1b0252 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MM-56695

    @mattermost-build
    mattermost-build committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    f2ee11a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into MM-56695

    @mattermost-build
    mattermost-build committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    be963ca View commit details
    Browse the repository at this point in the history

  5. Merge branch 'MM-56695' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 12, 2024
    Configuration menu
    Copy the full SHA
    445bfcb View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. combined desk&mob thread notif, select mobile push notif

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    349290f View commit details
    Browse the repository at this point in the history

  2. different mobile notify

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    475b4b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Update en.json

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    a4a9c3f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:mattermost/mattermost into MM-56609… 

    …-headers
    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    8affb75 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    1fe4874 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    63e52ef View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    dafca6a View commit details
    Browse the repository at this point in the history

  2. email threads

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    4351304 View commit details
    Browse the repository at this point in the history

  3. divider bug fixed

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    008ff4f View commit details
    Browse the repository at this point in the history

  4. update logic for nothing but with diff mobile setting for non nothing… 

    … mobile sett
    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    e0972c0 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. clean up functions

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    9d81d6e View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. change the fix for threads appearance

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    6bdbeb5 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. change collapsed text

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    928be6f View commit details
    Browse the repository at this point in the history

  2. change of name

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    6938606 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    cd2f23c View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'master' of github.com:mattermost/mattermost into MM-56609… 

    …-headers
    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    5e8cccd View commit details
    Browse the repository at this point in the history

  2. sounds notification settings

    @M-ZubairAhmed
    M-ZubairAhmed committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    f667f54 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    bb07c7e View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    00dc59f View commit details
    Browse the repository at this point in the history

  2. add ringing

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    3eef598 View commit details
    Browse the repository at this point in the history

  3. to func

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    5b4d196 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. intermediate commit

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    7f9f273 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    7a132b4 View commit details
    Browse the repository at this point in the history

  2. pause ringing on select

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    8135f5b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. translation changes

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    310db04 View commit details
    Browse the repository at this point in the history

  2. more tests..

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    6b7e5a2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    4a1790b View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    b64775d View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. added push notif disabled message

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    e0aa7f9 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    98ad273 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. changes to no push text

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    e3ace6b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    a586b3b View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    be4d3b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. text updated

    @M-ZubairAhmed
    M-ZubairAhmed committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    95ab87c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    a7a4955 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    0d4693a View commit details
    Browse the repository at this point in the history

  3. few e2e fixed

    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    c0bf290 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'MM-56609-headers' of github.com:mattermost/mattermost i… 

    …nto MM-56609-headers
    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    721664a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    9a08991 View commit details
    Browse the repository at this point in the history

  6. e2e fix

    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    aa7ac70 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into MM-56609-headers

    @mattermost-build
    mattermost-build committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    ccaaa0e View commit details
    Browse the repository at this point in the history

  8. casing changes

    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    b8dfeb9 View commit details
    Browse the repository at this point in the history

  9. fdf

    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    e04da61 View commit details
    Browse the repository at this point in the history

  10. Update user_settings_notifications.test.tsx.snap

    @M-ZubairAhmed
    M-ZubairAhmed committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    aa115fe View commit details
    Browse the repository at this point in the history