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

Custom Public Chats #35

Merged
merged 12 commits into from
Oct 15, 2019
Merged

Custom Public Chats #35

merged 12 commits into from
Oct 15, 2019

Commits on Oct 10, 2019

  1. Added database functionality.

    @Mikunj
    Mikunj committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    8b92932 View commit details
    Browse the repository at this point in the history

  2. Added public chat manager. 

    Replace hard coded public chat server with dynamic one.
    @Mikunj
    Mikunj committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    13d42f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Add UI

    @Mikunj
    Mikunj committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    b676c25 View commit details
    Browse the repository at this point in the history

  2. UI improvements.

    @Mikunj
    Mikunj committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    4657b79 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into custom-server 

    # Conflicts:
#	src/org/thoughtcrime/securesms/loki/DisplayNameActivity.kt
    @Mikunj
    Mikunj committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    2f18c5b View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2019

  1. Partially fix build

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    a8c4fa2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:loki-project/loki-messenger-android … 

    …into custom-server
    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    08a1b0e View commit details
    Browse the repository at this point in the history

  3. Fix build

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    65f9583 View commit details
    Browse the repository at this point in the history

  4. Clean

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    4a613df View commit details
    Browse the repository at this point in the history

  5. Add missing display name update & message fetch

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    cbad885 View commit details
    Browse the repository at this point in the history

  6. Fix mentions bug

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    c2d4f4b View commit details
    Browse the repository at this point in the history

  7. Move add public chat button to home screen

    @nielsandriesse
    nielsandriesse committed Oct 15, 2019
    Configuration menu
    Copy the full SHA
    a5b543c View commit details
    Browse the repository at this point in the history