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

Please delete/ignore this #7652

Closed
wants to merge 23 commits into from
Closed

Please delete/ignore this #7652

wants to merge 23 commits into from

Commits on Sep 6, 2018

  1. Update config.sample.json

    @Ashaman-
    Ashaman- authored Sep 6, 2018
    Configuration menu
    Copy the full SHA
    db6d84a View commit details
    Browse the repository at this point in the history

  2. Update config.json

    @Ashaman-
    Ashaman- authored Sep 6, 2018
    Configuration menu
    Copy the full SHA
    d32e52a View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2018

  1. Merge pull request #1 from vector-im/master 

    Update from upstream
    @Ashaman-
    Ashaman- authored Sep 15, 2018
    Configuration menu
    Copy the full SHA
    5412767 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from vector-im/develop 

    Develop
    @Ashaman-
    Ashaman- authored Sep 15, 2018
    Configuration menu
    Copy the full SHA
    91ebbe4 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2018

  1. Update config.sample.json

    @Ashaman-
    Ashaman- authored Sep 16, 2018
    Configuration menu
    Copy the full SHA
    062aed7 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. Update config.sample.json

    @Ashaman-
    Ashaman- authored Sep 17, 2018
    Configuration menu
    Copy the full SHA
    d943669 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2018

  1. Updated electron config

    @Ashaman-
    Ashaman- committed Sep 23, 2018
    Configuration menu
    Copy the full SHA
    a0b2e8c View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2018

  1. Update config.json

    @Ashaman-
    Ashaman- committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    c68e81b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into develop

    @Ashaman-
    Ashaman- authored Oct 1, 2018
    Configuration menu
    Copy the full SHA
    d4dc8d0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from neocrypto-io/develop 

    Develop
    @Ashaman-
    Ashaman- authored Oct 1, 2018
    Configuration menu
    Copy the full SHA
    d126ca8 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2018

  1. Merge pull request #5 from vector-im/master 

    Update master from upstream
    @Ashaman-
    Ashaman- authored Oct 3, 2018
    Configuration menu
    Copy the full SHA
    c006bd1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'production' into master

    @Ashaman-
    Ashaman- authored Oct 3, 2018
    Configuration menu
    Copy the full SHA
    dc7623d View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2018

  1. Updated config.json

    @Ashaman-
    Ashaman- committed Oct 4, 2018
    Configuration menu
    Copy the full SHA
    8636f68 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2018

  1. Change riot.im for chat.neocrypto.io in all the places, favicons, mat… 

    …omo code, etc
    @Ashaman-
    Ashaman- committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    a30bc04 View commit details
    Browse the repository at this point in the history

  2. Fix piwik tracking

    @Ashaman-
    Ashaman- committed Oct 5, 2018
    Configuration menu
    Copy the full SHA
    6ee8222 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2018

  1. Alphanumeric matomo ID, remove matomoc code from index

    @Ashaman-
    Ashaman- committed Oct 6, 2018
    Configuration menu
    Copy the full SHA
    9bf6578 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2018

  1. Add link to wiki to login page

    @Ashaman-
    Ashaman- committed Oct 7, 2018
    Configuration menu
    Copy the full SHA
    9f3cf48 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2018

  1. update matrix-react-sdk to 0.13.6

    @bwindels @Ashaman-
    bwindels authored and Ashaman- committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    1daaf3f View commit details
    Browse the repository at this point in the history

  2. v0.16.6

    @bwindels @Ashaman-
    bwindels authored and Ashaman- committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    6041be1 View commit details
    Browse the repository at this point in the history

  3. Prepare changelog for v0.16.6

    @bwindels @Ashaman-
    bwindels authored and Ashaman- committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    3b90484 View commit details
    Browse the repository at this point in the history

  4. v0.16.6

    @bwindels @Ashaman-
    bwindels authored and Ashaman- committed Oct 9, 2018
    Configuration menu
    Copy the full SHA
    4530ea4 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2018

  1. Added icons for desktop version, fixed typo in config.json

    @Ashaman-
    Ashaman- committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    70f1aad View commit details
    Browse the repository at this point in the history

  2. Fixed invalid version

    @Ashaman-
    Ashaman- committed Oct 10, 2018
    Configuration menu
    Copy the full SHA
    79ffd84 View commit details
    Browse the repository at this point in the history