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

Initial Electron Settings - for Auto Launch #920

Merged
merged 6 commits into from May 30, 2017
Merged

Initial Electron Settings - for Auto Launch #920

merged 6 commits into from May 30, 2017

Commits on May 24, 2017

  1. Initial Electron Settings - for Auto Launch 

    (opens path for Proxy Settings)

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

  2. remove listener on unmount 

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

Commits on May 29, 2017

  1. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/electron_settings
    @t3chguy
    t3chguy committed May 29, 2017
    Configuration menu
    Copy the full SHA
    a2229ce 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 May 29, 2017
    Configuration menu
    Copy the full SHA
    7e02977 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. change wording and i18n it 

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

  2. Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into… 

    … t3chguy/electron_settings

# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

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