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

Use templates for issue e-mail subject and body #8329

Merged
merged 57 commits into from
Nov 7, 2019
Merged
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
9dbabcd
Merge go-gitea/master into master
guillep2k Sep 14, 2019
889c619
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 14, 2019
d7c46c8
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 15, 2019
8eaacbf
Merge remote-tracking branch 'refs/remotes/origin/master'
guillep2k Sep 19, 2019
de5aa64
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 19, 2019
80c6f2b
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 20, 2019
ac40f7f
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 22, 2019
f6ac46b
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 23, 2019
b563158
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 25, 2019
6f55d1e
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 25, 2019
188e164
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 26, 2019
fd6fe8c
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 27, 2019
54624dd
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 29, 2019
e2a6388
Merge branch 'master' of github.com:go-gitea/gitea
guillep2k Sep 30, 2019
2714a5d
Add template capability for issue mail subject
guillep2k Oct 1, 2019
c4f6c1d
Remove test string
guillep2k Oct 1, 2019
83624a9
Fix trim subject length
guillep2k Oct 1, 2019
c68bbd6
Add comment to template and run make fmt
guillep2k Oct 1, 2019
3d25d11
Add information for the template
guillep2k Oct 1, 2019
a366af6
Merge branch 'master' into fix-email-subject
guillep2k Oct 3, 2019
78b2e34
merge from latest master
guillep2k Oct 10, 2019
6049215
Rename defaultMailSubject() to fallbackMailSubject()
guillep2k Oct 16, 2019
39a6094
Merge branch 'master' into fix-email-subject
guillep2k Oct 21, 2019
70d1d44
General rewrite of the mail template code
guillep2k Oct 21, 2019
120ff55
Merge branch 'master' into fix-email-subject
guillep2k Oct 21, 2019
679338b
Fix .Doer name
guillep2k Oct 21, 2019
24967be
Use text/template for subject instead of html
guillep2k Oct 21, 2019
1ce2530
Fix subject Re: prefix
guillep2k Oct 21, 2019
2bba363
Fix mail tests
guillep2k Oct 22, 2019
6aa4433
Fix static templates
guillep2k Oct 22, 2019
b31fb25
Merge branch 'master' into fix-email-subject
guillep2k Oct 22, 2019
8383b95
[skip ci] Updated translations via Crowdin
GiteaBot Oct 21, 2019
3db7c21
Expose db.SetMaxOpenConns and allow non MySQL dbs to set conn pool pa…
zeripath Oct 21, 2019
ab1ab0f
Prevent .code-view from overriding font on icon fonts (#8614)
zeripath Oct 21, 2019
7d5074b
Correct some outdated statements in the contributing guidelines (#8612)
lukbukkit Oct 21, 2019
9140b3b
Remove TrN due to lack of lang context
guillep2k Oct 22, 2019
554850e
Redo templates to match previous code
guillep2k Oct 22, 2019
fe6f873
Merge branch 'fix-email-subject' of github.com:guillep2k/gitea into f…
guillep2k Oct 23, 2019
f65e5d2
Fix extra character in template
guillep2k Oct 23, 2019
111a036
Unify PR & Issue tempaltes, fix format
guillep2k Oct 23, 2019
fa9e93b
Remove default subject
guillep2k Oct 23, 2019
cbf32f1
Add template tests
guillep2k Oct 23, 2019
d823b73
Fix template
guillep2k Oct 23, 2019
083f26e
Remove replaced function
guillep2k Oct 23, 2019
1a40a79
Merge branch 'master' into fix-email-subject
guillep2k Oct 23, 2019
74d9c3b
Provide User as models.User for better consistency
guillep2k Oct 23, 2019
e02aa11
Add docs
guillep2k Oct 23, 2019
e1ab7c4
Fix doc inaccuracies, improve examples
guillep2k Oct 23, 2019
e4065fc
Merge branch 'master' into fix-email-subject
guillep2k Oct 23, 2019
c84a489
Change mail footer to math AppName
guillep2k Oct 24, 2019
1d0302d
Merge branch 'master' into fix-email-subject
guillep2k Oct 25, 2019
2cad1b1
Add test for mail subject/body template separation
guillep2k Oct 25, 2019
507ef55
Add support for code review comments
guillep2k Oct 25, 2019
52966ee
Merge master and resolve conflicts
guillep2k Oct 25, 2019
93e8cfa
Update docs/content/doc/advanced/mail-templates-us.md
guillep2k Nov 6, 2019
21d9de0
Merge branch 'master' into fix-email-subject
lunny Nov 6, 2019
79f891f
Merge branch 'master' into fix-email-subject
lunny Nov 7, 2019
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
Prev Previous commit
Next Next commit
Prevent .code-view from overriding font on icon fonts (#8614)
  • Loading branch information
zeripath authored and guillep2k committed Oct 23, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit ab1ab0f2b02e2549849775109bc90d914622ee1c
2 changes: 1 addition & 1 deletion public/css/index.css
Original file line number Diff line number Diff line change
@@ -243,7 +243,7 @@ i.icon.centerlock{top:1.5em}
.lines-commit .ui.avatar.image{height:18px;width:18px}
.lines-code .bottom-line,.lines-commit .bottom-line,.lines-num .bottom-line{border-bottom:1px solid #eaecef}
.code-view{overflow:auto;overflow-x:auto;overflow-y:hidden}
.code-view *{font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
.code-view :not(.fa):not(.octicon):not(.icon){font-size:12px;font-family:'SF Mono',Consolas,Menlo,'Liberation Mono',Monaco,'Lucida Console',monospace;line-height:20px}
.code-view table{width:100%}
.code-view .active{background:#fff866}
.markdown:not(code){overflow:hidden;font-size:16px;line-height:1.6!important;word-wrap:break-word}
2 changes: 1 addition & 1 deletion public/less/_base.less
Original file line number Diff line number Diff line change
@@ -1063,7 +1063,7 @@ i.icon.centerlock {
overflow-x: auto;
overflow-y: hidden;

* {
*:not(.fa):not(.octicon):not(.icon) {
font-size: 12px;
font-family: @monospaced-fonts, monospace;
line-height: 20px;