Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add Foldable Images #4349

Closed
wants to merge 41 commits into from
Closed

Add Foldable Images #4349

wants to merge 41 commits into from

Commits on Dec 19, 2019

  1. Rewire the Sticker button to be an Emoji Picker

    @t3chguy
    t3chguy committed Dec 19, 2019
    Configuration menu
    Copy the full SHA
    833dcba View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. Add Foldable Images

    @thedanisaur
    thedanisaur committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    ed047ae View commit details
    Browse the repository at this point in the history

  2. Remove unused import

    @thedanisaur
    thedanisaur committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    6eeaa20 View commit details
    Browse the repository at this point in the history

  3. Breakout Chevron

    @thedanisaur
    thedanisaur committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    9736262 View commit details
    Browse the repository at this point in the history

  4. Update CSS colors

    @thedanisaur
    thedanisaur committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    cd99b58 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Prevent images from jumping off screen when un/collapsing.

    @thedanisaur
    thedanisaur committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    184b212 View commit details
    Browse the repository at this point in the history

  2. Fix linting errors.

    @thedanisaur
    thedanisaur committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    186cda0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. Reduce vertical height.

    @thedanisaur
    thedanisaur committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    23c9036 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Merge branches 'develop' and 't3chguy/emoji_picker_composer' of githu… 

    …b.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer

� Conflicts:
�	src/components/views/rooms/MessageComposer.js
    @t3chguy
    t3chguy committed May 29, 2020
    Configuration menu
    Copy the full SHA
    ccd0c95 View commit details
    Browse the repository at this point in the history

  2. Implement new design with new iconography 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed May 29, 2020
    Configuration menu
    Copy the full SHA
    f40cfe4 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. iterate PR 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    3020e39 View commit details
    Browse the repository at this point in the history

  2. i18n 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    ef1d682 View commit details
    Browse the repository at this point in the history

  3. Upgrade matrix-js-sdk to 6.2.0-rc.1

    @RiotRobot
    RiotRobot committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    98a6dd8 View commit details
    Browse the repository at this point in the history

  4. Prepare changelog for v2.7.0-rc.1

    @RiotRobot
    RiotRobot committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    5880297 View commit details
    Browse the repository at this point in the history

  5. v2.7.0-rc.1

    @RiotRobot
    RiotRobot committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    039c42d View commit details
    Browse the repository at this point in the history

  6. Merge branches 'develop' and 't3chguy/emoji_picker_composer' of githu… 

    …b.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer
    @t3chguy
    t3chguy committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    3fbfb62 View commit details
    Browse the repository at this point in the history

  7. Merge pull request matrix-org#4684 from matrix-org/t3chguy/emoji_pick… 

    …er_composer

Rewire the Sticker button to be an Emoji Picker to release
    @t3chguy
    t3chguy authored Jun 2, 2020
    Configuration menu
    Copy the full SHA
    8a93a9d View commit details
    Browse the repository at this point in the history

  8. Prepare changelog for v2.7.0-rc.2

    @RiotRobot
    RiotRobot committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    c31cfbd View commit details
    Browse the repository at this point in the history

  9. v2.7.0-rc.2

    @RiotRobot
    RiotRobot committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    ec35445 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Fix login loop where the sso flow returns to #/login 

    due to fragmentAfterLogin going back to `#/login`
and element-hq/element-web#11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    84d81ff View commit details
    Browse the repository at this point in the history

  2. change names of consts for clarity 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    096045a View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Merge pull request matrix-org#4693 from matrix-org/t3chguy/sso-query 

    Fix login loop where the sso flow returns to `#/login` to release
    @t3chguy
    t3chguy authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    e6a776b View commit details
    Browse the repository at this point in the history

  2. Fix checkbox bleed

    @JorikSchellekens @jryans
    JorikSchellekens authored and jryans committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ca69a9d View commit details
    Browse the repository at this point in the history

  3. Merge pull request matrix-org#4702 from matrix-org/jryans/release-4691 

    Fix checkbox bleed
    @jryans
    jryans authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    4e623fa View commit details
    Browse the repository at this point in the history

  4. When trying to restore a keyback that has its key in 4S, check if 4S … 

    …will be readable

If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
    @bwindels
    bwindels committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    40cabd2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request matrix-org#4703 from matrix-org/bwindels/preventbo… 

    …otstrapfromkeybackuprestore-rc

Prevent (double) 4S bootstrap from RestoreKeyBackupDialog
    @bwindels
    bwindels authored Jun 4, 2020
    Configuration menu
    Copy the full SHA
    737c31a View commit details
    Browse the repository at this point in the history

  6. Upgrade matrix-js-sdk to 6.2.0

    @RiotRobot
    RiotRobot committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    07a12a7 View commit details
    Browse the repository at this point in the history

  7. Prepare changelog for v2.7.0

    @RiotRobot
    RiotRobot committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    5aff8f7 View commit details
    Browse the repository at this point in the history

  8. v2.7.0

    @RiotRobot
    RiotRobot committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    65e59fd View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Fix compact layout regression 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit f4f23db)
    @t3chguy
    t3chguy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0dc788e View commit details
    Browse the repository at this point in the history

  2. Fix not being able to dismiss new login toasts 

    `toastKey` is a thing.

Fixes element-hq/element-web#13923

(cherry picked from commit c667ea6)
    @turt2live @t3chguy
    turt2live authored and t3chguy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ab9284f View commit details
    Browse the repository at this point in the history

  3. Merge pull request matrix-org#4714 from matrix-org/t3chguy/1.6.4/r1 

    Fix compact layout regression
    @t3chguy
    t3chguy authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    04e6112 View commit details
    Browse the repository at this point in the history

  4. Merge pull request matrix-org#4715 from matrix-org/t3chguy/1.6.4/r2 

    Fix not being able to dismiss new login toasts
    @t3chguy
    t3chguy authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    455b915 View commit details
    Browse the repository at this point in the history

  5. Upgrade matrix-js-sdk to 6.2.1

    @RiotRobot
    RiotRobot committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    e78fa60 View commit details
    Browse the repository at this point in the history

  6. Fix exceptions from Tooltip 

    renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.

(cherry picked from commit 5e569d7)
    @dbkr @t3chguy
    dbkr authored and t3chguy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    93ed062 View commit details
    Browse the repository at this point in the history

  7. Merge pull request matrix-org#4716 from matrix-org/t3chguy/1.6.4/r3 

    Fix exceptions from Tooltip
    @t3chguy
    t3chguy authored Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b49d437 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'release-v2.7.1' of github.com:matrix-org/matrix-react-s… 

    …dk into release-v2.7.1
    @RiotRobot
    RiotRobot committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    68623b4 View commit details
    Browse the repository at this point in the history

  9. Prepare changelog for v2.7.1

    @RiotRobot
    RiotRobot committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    94059b8 View commit details
    Browse the repository at this point in the history

  10. v2.7.1

    @RiotRobot
    RiotRobot committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    c8366b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2020

  1. Merge branch 'master' into thedanisaur/2466-foldable-images

    @thedanisaur
    thedanisaur committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    736197e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2020

  1. Animate image collapse.

    @thedanisaur
    thedanisaur committed Jun 7, 2020
    Configuration menu
    Copy the full SHA
    200dd3e View commit details
    Browse the repository at this point in the history