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

[IMPROVE] New emails design #12009

Merged
merged 31 commits into from
Sep 28, 2018
Merged

[IMPROVE] New emails design #12009

merged 31 commits into from
Sep 28, 2018

Commits on Sep 10, 2018

  1. first commit

    @ggazzo
    ggazzo committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    7ed0b89 View commit details
    Browse the repository at this point in the history

  2. improved the mostly used emails

    @ggazzo
    ggazzo committed Sep 10, 2018
    Configuration menu
    Copy the full SHA
    106fd61 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2018

  1. Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new-… 

    …email-templates
    @ggazzo
    ggazzo committed Sep 17, 2018
    Configuration menu
    Copy the full SHA
    6fbd9e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2018

  1. improve name functions

    @ggazzo
    ggazzo committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    6624162 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into new-email-templates

    @ggazzo
    ggazzo authored Sep 18, 2018
    Configuration menu
    Copy the full SHA
    0ffb639 View commit details
    Browse the repository at this point in the history

  3. removed

    @ggazzo
    ggazzo committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    bcbd80d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/new-email-templates' into new-em… 

    …ail-templates
    @ggazzo
    ggazzo committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    18bdcf7 View commit details
    Browse the repository at this point in the history

  5. 18n removed unused keys

    @ggazzo
    ggazzo committed Sep 18, 2018
    Configuration menu
    Copy the full SHA
    45ca730 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2018

  1. auto replace data on emails

    @ggazzo
    ggazzo committed Sep 19, 2018
    Configuration menu
    Copy the full SHA
    9189b9c View commit details
    Browse the repository at this point in the history

  2. removed default smtp values

    @ggazzo
    ggazzo committed Sep 19, 2018
    Configuration menu
    Copy the full SHA
    cc750b9 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2018

  1. removed default smtp values

    @ggazzo
    ggazzo committed Sep 20, 2018
    Configuration menu
    Copy the full SHA
    ef4d98b View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2018

  1. migration

    @ggazzo
    ggazzo committed Sep 21, 2018
    Configuration menu
    Copy the full SHA
    350238a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/new-email-templates' into new-em… 

    …ail-templates
    @ggazzo
    ggazzo committed Sep 21, 2018
    Configuration menu
    Copy the full SHA
    f1b70f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2018

  1. Merge remote-tracking branch 'origin/develop' into new-email-templates

    @ggazzo
    ggazzo committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    06bdd7e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into new-email-templates

    @sampaiodiego
    sampaiodiego authored Sep 24, 2018
    Configuration menu
    Copy the full SHA
    7013743 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into new-email-templates

    @ggazzo
    ggazzo committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    aed9cf7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'new-email-templates' of github.com:RocketChat/Rocket.Ch… 

    …at into new-email-templates
    @sampaiodiego
    sampaiodiego committed Sep 24, 2018
    Configuration menu
    Copy the full SHA
    93edf8f View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Improve getTemplate

    @sampaiodiego
    sampaiodiego committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    a5aa3dd View commit details
    Browse the repository at this point in the history

  2. Fix migration

    @sampaiodiego
    sampaiodiego committed Sep 25, 2018
    Configuration menu
    Copy the full SHA
    606d1bb View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2018

  1. test

    @ggazzo
    ggazzo committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    27f859d View commit details
    Browse the repository at this point in the history

  2. teste

    @ggazzo
    ggazzo committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    3f3ca20 View commit details
    Browse the repository at this point in the history

  3. Finish review

    @ggazzo
    ggazzo committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    39d9df2 View commit details
    Browse the repository at this point in the history

  4. rebuild templates when header/footer changes

    @ggazzo
    ggazzo committed Sep 26, 2018
    Configuration menu
    Copy the full SHA
    012cded View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2018

  1. Change migration version to 134

    @sampaiodiego
    sampaiodiego committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    463af06 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into new-email-templates

    @sampaiodiego
    sampaiodiego committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    8b1e916 View commit details
    Browse the repository at this point in the history

  3. Fix translations

    @sampaiodiego
    sampaiodiego committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    1136f41 View commit details
    Browse the repository at this point in the history

  4. Fix test

    @sampaiodiego
    sampaiodiego committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    25d1e59 View commit details
    Browse the repository at this point in the history

  5. renamed some setting during migration

    @ggazzo
    ggazzo committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    b611f69 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'new-email-templates' of github.com:RocketChat/Rocket.Ch… 

    …at into new-email-templates
    @ggazzo
    ggazzo committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    0bafc82 View commit details
    Browse the repository at this point in the history

  7. fix migration, ops

    @ggazzo
    ggazzo committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    4bc4e7f View commit details
    Browse the repository at this point in the history

  8. Fix migration again v2

    @sampaiodiego
    sampaiodiego committed Sep 27, 2018
    Configuration menu
    Copy the full SHA
    6341d27 View commit details
    Browse the repository at this point in the history