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

[NEW] resolve merge share function #6577

Merged
merged 16 commits into from
Apr 3, 2017
Merged

[NEW] resolve merge share function #6577

merged 16 commits into from
Apr 3, 2017

Commits on Aug 17, 2016

  1. updated share box

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7e7931b View commit details
    Browse the repository at this point in the history

  2. updates to RTL layout file

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    5130c99 View commit details
    Browse the repository at this point in the history

  3. small padding changes

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    8be3e23 View commit details
    Browse the repository at this point in the history

  4. corrections for rtl and boz sizing

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    7157dba View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/develop' into better-mb

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    f918073 View commit details
    Browse the repository at this point in the history

  6. shift emoij button back to left

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    f5d49ac View commit details
    Browse the repository at this point in the history

  7. correct right/left emoij picker

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    ce7aa21 View commit details
    Browse the repository at this point in the history

  8. fix css for share slide-out

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    5d29a4f View commit details
    Browse the repository at this point in the history

  9. group attachments under single settings section under Message->Messag… 

    …e Attachments, added the option to group the attachment buttons, added i18n strings for new settings, updates existing attachment packages to reflect new settings section
    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    4ba3290 View commit details
    Browse the repository at this point in the history

  10. modify the way the template is rendered based on settings

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    c4d2ea9 View commit details
    Browse the repository at this point in the history

  11. removed unused less

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    fcdef79 View commit details
    Browse the repository at this point in the history

  12. tidy code for cleaner pull

    @tgxn
    tgxn committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    6ef3d82 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. Merge remote-tracking branch 'upstream/develop' into better-mb

    @tgxn
    tgxn committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    8c07613 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2017

  1. resolve merge conflicts

    @karlprieb
    karlprieb committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    cae8083 View commit details
    Browse the repository at this point in the history

  2. fix indentation

    @karlprieb
    karlprieb committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    608489a View commit details
    Browse the repository at this point in the history

  3. fix message box border color

    @karlprieb
    karlprieb committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    16bd5ef View commit details
    Browse the repository at this point in the history