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

Travis/pr 6188 merge test #8271

Closed
wants to merge 20 commits into from
Closed

Travis/pr 6188 merge test #8271

wants to merge 20 commits into from

Commits on Jun 15, 2021

  1. add heart effect

    @CicadaCinema
    CicadaCinema committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    9f044cb View commit details
    Browse the repository at this point in the history

  2. clean up syntax

    @CicadaCinema
    CicadaCinema committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    4d8aecf View commit details
    Browse the repository at this point in the history

  3. convert indentation to spaces

    @CicadaCinema
    CicadaCinema committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    08c1694 View commit details
    Browse the repository at this point in the history

  4. appease the linter

    @CicadaCinema
    CicadaCinema committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    9f6ef9e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'matrix-org:develop' into develop

    @CicadaCinema
    CicadaCinema committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    6d543fa View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. Merge branch 'matrix-org:develop' into develop

    @CicadaCinema
    CicadaCinema committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    3315a5a View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. Merge branch 'develop' into develop

    @CicadaCinema
    CicadaCinema authored Oct 6, 2021
    Configuration menu
    Copy the full SHA
    c5de455 View commit details
    Browse the repository at this point in the history

  2. hopefully resolve merge conflict

    @CicadaCinema
    CicadaCinema authored Oct 6, 2021
    Configuration menu
    Copy the full SHA
    03a5c2c View commit details
    Browse the repository at this point in the history

  3. add missing semicolons

    @CicadaCinema
    CicadaCinema authored Oct 6, 2021
    Configuration menu
    Copy the full SHA
    53b6fd8 View commit details
    Browse the repository at this point in the history

  4. add label to toggle switch

    @CicadaCinema
    CicadaCinema committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    5e83d9b View commit details
    Browse the repository at this point in the history

  5. Revert "add label to toggle switch" 

    This reverts commit 5e83d9b.
    @CicadaCinema
    CicadaCinema committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    f2a51ab View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2022

  1. Merge branch 'develop' into develop

    @CicadaCinema
    CicadaCinema authored Feb 13, 2022
    Configuration menu
    Copy the full SHA
    ea701cb View commit details
    Browse the repository at this point in the history

  2. remove extra space

    @CicadaCinema
    CicadaCinema authored Feb 13, 2022
    Configuration menu
    Copy the full SHA
    3dea9c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2022

  1. Merge branch 'develop' into develop

    @CicadaCinema
    CicadaCinema authored Feb 16, 2022
    Configuration menu
    Copy the full SHA
    715e4e0 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2022

  1. replace gift heart with emoji heart in timeline message

    @CicadaCinema
    CicadaCinema authored Feb 21, 2022
    Configuration menu
    Copy the full SHA
    e1b68b0 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. reduce number of emoji triggers

    @CicadaCinema
    CicadaCinema authored Mar 8, 2022
    Configuration menu
    Copy the full SHA
    bc87cd9 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. copyright should be myself

    @CicadaCinema
    CicadaCinema authored Mar 10, 2022
    Configuration menu
    Copy the full SHA
    da6d6d1 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Update src/effects/index.ts

    @turt2live
    turt2live authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    ad5d1ad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop

    @turt2live
    turt2live authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    3f14588 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'CicadaCinema/develop' into travis/pr-61… 

    …88-merge-test
    @turt2live
    turt2live committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    6f8c933 View commit details
    Browse the repository at this point in the history