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.

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

[IMPROVE] New emails design #12009

Merged
merged 31 commits into from
Sep 28, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7ed0b89
first commit
ggazzo Sep 10, 2018
106fd61
improved the mostly used emails
ggazzo Sep 10, 2018
6fbd9e0
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new-…
ggazzo Sep 17, 2018
6624162
improve name functions
ggazzo Sep 18, 2018
0ffb639
Merge branch 'develop' into new-email-templates
ggazzo Sep 18, 2018
bcbd80d
removed
ggazzo Sep 18, 2018
18bdcf7
Merge remote-tracking branch 'origin/new-email-templates' into new-em…
ggazzo Sep 18, 2018
45ca730
18n removed unused keys
ggazzo Sep 18, 2018
9189b9c
auto replace data on emails
ggazzo Sep 19, 2018
cc750b9
removed default smtp values
ggazzo Sep 19, 2018
ef4d98b
removed default smtp values
ggazzo Sep 19, 2018
350238a
migration
ggazzo Sep 21, 2018
f1b70f0
Merge remote-tracking branch 'origin/new-email-templates' into new-em…
ggazzo Sep 21, 2018
06bdd7e
Merge remote-tracking branch 'origin/develop' into new-email-templates
ggazzo Sep 24, 2018
7013743
Merge branch 'develop' into new-email-templates
sampaiodiego Sep 24, 2018
aed9cf7
Merge remote-tracking branch 'origin/develop' into new-email-templates
ggazzo Sep 24, 2018
93edf8f
Merge branch 'new-email-templates' of github.com:RocketChat/Rocket.Ch…
sampaiodiego Sep 24, 2018
a5aa3dd
Improve getTemplate
sampaiodiego Sep 25, 2018
606d1bb
Fix migration
sampaiodiego Sep 25, 2018
27f859d
test
ggazzo Sep 26, 2018
3f3ca20
teste
ggazzo Sep 26, 2018
39d9df2
Finish review
ggazzo Sep 26, 2018
012cded
rebuild templates when header/footer changes
ggazzo Sep 26, 2018
463af06
Change migration version to 134
sampaiodiego Sep 27, 2018
8b1e916
Merge branch 'develop' into new-email-templates
sampaiodiego Sep 27, 2018
1136f41
Fix translations
sampaiodiego Sep 27, 2018
25d1e59
Fix test
sampaiodiego Sep 27, 2018
b611f69
renamed some setting during migration
ggazzo Sep 27, 2018
0bafc82
Merge branch 'new-email-templates' of github.com:RocketChat/Rocket.Ch…
ggazzo Sep 27, 2018
4bc4e7f
fix migration, ops
ggazzo Sep 27, 2018
6341d27
Fix migration again v2
sampaiodiego Sep 27, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ rocketchat:lazy-load
tap:i18n
underscore
rocketchat:bigbluebutton
rocketchat:mailmessages
1 change: 1 addition & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ rocketchat:livestream@0.0.5
rocketchat:logger@0.0.1
rocketchat:login-token@1.0.0
rocketchat:mailer@0.0.1
rocketchat:mailmessages@0.0.1
rocketchat:mapview@0.0.1
rocketchat:markdown@0.0.2
rocketchat:mentions@0.0.1
Expand Down
Loading