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

Merge upstream 3.3.0 #23

Merged
merged 33 commits into from
Aug 28, 2023
Merged

Merge upstream 3.3.0 #23

merged 33 commits into from
Aug 28, 2023
+217 −21

Commits on Aug 27, 2020

  1. Fix building example app, fix assets, fix plist

    @Kaspik
    Kaspik committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    94fd070 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into exampleFix

    @Kaspik
    Kaspik authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    3187e99 View commit details
    Browse the repository at this point in the history

  3. Merge pull request MessageKit#1441 from MessageKit/exampleFix 

    Fix Example app merge issues #trivial
    @Kaspik
    Kaspik authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    f1ffd39 View commit details
    Browse the repository at this point in the history

  4. Update IBAV dependency to 5.1.0 with dark mode support

    @Kaspik
    Kaspik committed Aug 27, 2020
    Configuration menu
    Copy the full SHA
    e535c73 View commit details
    Browse the repository at this point in the history

  5. Merge pull request MessageKit#1442 from MessageKit/ibav 

    Update IBAV to 5.1.0 with Dark Mode support #trivial
    @Kaspik
    Kaspik authored Aug 27, 2020
    Configuration menu
    Copy the full SHA
    3810e74 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2020

  1. Add pan gesture

    @amirpirzad
    amirpirzad committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    ddfce2e View commit details
    Browse the repository at this point in the history

  2. Check pan gesture direction

    @amirpirzad
    amirpirzad committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    57e77b0 View commit details
    Browse the repository at this point in the history

  3. Add message time label

    @amirpirzad
    amirpirzad committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    216d26b View commit details
    Browse the repository at this point in the history

  4. Add boolean for enable/disable display time

    @amirpirzad
    amirpirzad committed Aug 28, 2020
    Configuration menu
    Copy the full SHA
    404f3ad View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2020

  1. Add comment

    @amirpirzad
    amirpirzad committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    5949d6e View commit details
    Browse the repository at this point in the history

  2. Change text color for dark mode

    @amirpirzad
    amirpirzad committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    72c4c21 View commit details
    Browse the repository at this point in the history

  3. Remove unused code

    @amirpirzad
    amirpirzad committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    8f17474 View commit details
    Browse the repository at this point in the history

  4. Add removePanGesture method

    @amirpirzad
    amirpirzad committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    f04a89c View commit details
    Browse the repository at this point in the history

  5. Change to better check

    @amirpirzad
    amirpirzad committed Aug 29, 2020
    Configuration menu
    Copy the full SHA
    c0a659d View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2020

  1. Use system color

    @amirpirzad
    amirpirzad committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    d4f0def View commit details
    Browse the repository at this point in the history

  2. Use property

    @amirpirzad
    amirpirzad committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    ad28df1 View commit details
    Browse the repository at this point in the history

  3. Fix center label

    @amirpirzad
    amirpirzad committed Aug 30, 2020
    Configuration menu
    Copy the full SHA
    be2eea0 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2020

  1. Fixes MessageKit#1446 - Added LinkPreview calculator into the list of… 

    … default calculators.
    @bguidolim
    bguidolim committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    20c6044 View commit details
    Browse the repository at this point in the history

  2. Added changelog entry

    @bguidolim
    bguidolim committed Aug 31, 2020
    Configuration menu
    Copy the full SHA
    ceb557c View commit details
    Browse the repository at this point in the history

  3. Merge pull request MessageKit#1447 from bguidolim/fix-issue-1446 

    Fixes MessageKit#1446 - Added LinkPreview calculator into the list of default calculators
    @Kaspik
    Kaspik authored Aug 31, 2020
    Configuration menu
    Copy the full SHA
    947b801 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. Fix some issues

    @amirpirzad
    amirpirzad committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    f08cdad View commit details
    Browse the repository at this point in the history

  2. Conform protocol

    @amirpirzad
    amirpirzad committed Sep 2, 2020
    Configuration menu
    Copy the full SHA
    d2b8777 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2020

  1. Add document

    @amirpirzad
    amirpirzad committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    c6bfdba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into development

    @Kaspik
    Kaspik authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    d80dc20 View commit details
    Browse the repository at this point in the history

  3. Update CHANGELOG.md

    @amirpirzad
    amirpirzad committed Sep 3, 2020
    Configuration menu
    Copy the full SHA
    d4c980a View commit details
    Browse the repository at this point in the history

  4. Update CHANGELOG.md 

    Co-authored-by: Martin Púčik <[email protected]>
    @Kaspik @martinpucik
    Kaspik and martinpucik authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    2fc4946 View commit details
    Browse the repository at this point in the history

  5. Merge pull request MessageKit#1444 from amirpirzad/development 

    Display message time by swiping left
    @Kaspik
    Kaspik authored Sep 3, 2020
    Configuration menu
    Copy the full SHA
    ab794e1 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2020

  1. Prepare release 3.3.0

    @Kaspik
    Kaspik committed Sep 4, 2020
    Configuration menu
    Copy the full SHA
    81b2f6f View commit details
    Browse the repository at this point in the history

  2. Update MessagesDataSource.swift

    @Kaspik
    Kaspik authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    0e27b92 View commit details
    Browse the repository at this point in the history

  3. Merge pull request MessageKit#1453 from MessageKit/development 

    Prepare release 3.3.0
    @Kaspik
    Kaspik authored Sep 4, 2020
    Configuration menu
    Copy the full SHA
    ae53cdd View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Force merge upstream/3.3.0 remaining conflicts

    @manicmaniac
    manicmaniac committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    fba1751 View commit details
    Browse the repository at this point in the history

  2. fixup! Resolve conflicts

    @manicmaniac
    manicmaniac committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    1da92e7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Comment out image cache clean up procedure

    @manicmaniac
    manicmaniac committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    d3de8c3 View commit details
    Browse the repository at this point in the history