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

Show recent room breadcrumbs on touchbar #183

Merged
merged 5 commits into from
Mar 22, 2023
Merged

Show recent room breadcrumbs on touchbar #183

merged 5 commits into from
Mar 22, 2023

Commits on Apr 13, 2021

  1. Initial TouchBar support containing breadcrumbs

    @t3chguy
    t3chguy committed Apr 13, 2021
    Configuration menu
    Copy the full SHA
    07d0591 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Merge branch 'develop' of github.com:vector-im/element-desktop into t… 

    …3chguy/fix/15988

# Conflicts:
#	src/electron-main.js
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/fix/15988

# Conflicts:
#	src/vector/platform/ElectronPlatform.tsx
    @t3chguy
    t3chguy committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    9cedf61 View commit details
    Browse the repository at this point in the history

  2. delint

    @t3chguy
    t3chguy committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    26dabe5 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Iterate

    @t3chguy
    t3chguy committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    cfb1602 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into t3chguy/fix/15988 

    # Conflicts:
#	src/ipc.ts
    @t3chguy
    t3chguy committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    7026622 View commit details
    Browse the repository at this point in the history