Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
41b2b4d3
Commit
41b2b4d3
authored
5 years ago
by
Jonathan Weth
Committed by
root
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request
#220
from Katharineum/feature/informal-notifications
Feature/informal notifications issue
#205
parents
08295a70
94e5e3c2
Loading
Loading
1 merge request
!86
Merge school-apps
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
schoolapps/templates/mail/notification.html
+2
-2
2 additions, 2 deletions
schoolapps/templates/mail/notification.html
schoolapps/templates/mail/notification.txt
+2
-2
2 additions, 2 deletions
schoolapps/templates/mail/notification.txt
with
4 additions
and
4 deletions
schoolapps/templates/mail/notification.html
+
2
−
2
View file @
41b2b4d3
...
...
@@ -2,7 +2,7 @@
<main>
<p>
Hallo {{ notification.user.get_full_name }},
<br>
wir haben eine neue Nachricht für
Sie
:
</p>
wir haben eine neue Nachricht für
dich
:
</p>
<blockquote>
<p>
{{ notification.description }}
</p>
{% if notification.link %}
...
...
@@ -11,5 +11,5 @@
</blockquote>
<p>
Von {{ notification.app }} am {{ notification.created_at }}
</p>
<i>
Ihr
SchoolApps-Team
</i>
<i>
Dein
SchoolApps-Team
</i>
</main>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
schoolapps/templates/mail/notification.txt
+
2
−
2
View file @
41b2b4d3
Hallo {{ notification.user.name }},
wir haben eine neue Nachricht für
Sie
wir haben eine neue Nachricht für
dich:
{{ notification.description }}
...
...
@@ -10,4 +10,4 @@ wir haben eine neue Nachricht für Sie
Von {{ notification.app }} am {{ notification.created_at }}
Ihr
SchoolApps-Team
Dein
SchoolApps-Team
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment