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 the local couterpart of emoji when it exists in /admin/custom_emojis #5467

Merged
merged 7 commits into from Nov 7, 2017
Merged

Show the local couterpart of emoji when it exists in /admin/custom_emojis #5467

merged 7 commits into from Nov 7, 2017

Commits on Oct 19, 2017

  1. Show the local couterpart of emoji when it exists in admin/custom_emojis

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    6922f90 View commit details
    Browse the repository at this point in the history

  2. Fix indentation

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    341db25 View commit details
    Browse the repository at this point in the history

  3. Fix error

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    ac62bfa View commit details
    Browse the repository at this point in the history

  4. Add class table-action-link to Overwrite link

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    f45419b View commit details
    Browse the repository at this point in the history

  5. Make it enable to overwrite emojis

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    1f4cae1 View commit details
    Browse the repository at this point in the history

  6. Make Code Climate happy

    @nullkal
    nullkal committed Oct 19, 2017
    Configuration menu
    Copy the full SHA
    017e162 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2017

  1. Merge remote-tracking branch 'upstream/master' into feature/show-loca… 

    …l-counterpart-when-it-exists
    @nullkal
    nullkal committed Oct 27, 2017
    Configuration menu
    Copy the full SHA
    50a5fbb View commit details
    Browse the repository at this point in the history