Merge remote-tracking branch 'upstream/master'
authorPete <pete@debu.gs>
Sun, 17 Jan 2021 10:30:11 +0000 (02:30 -0800)
committerPete <pete@debu.gs>
Sun, 17 Jan 2021 10:30:11 +0000 (02:30 -0800)
1  2 
service/service.go
static/style.css
templates/nav.tmpl
templates/notification.tmpl
templates/status.tmpl
templates/user.tmpl

Simple merge
Simple merge
Simple merge
Simple merge
index 429d01befbc21e6db72d2ca9910cf47977e9185d,a1e2d9f63eb59b681eb3a503f8f3582ec99d3d6c..34f19e5f3c04148cfd67cda3b695bf0753b24413
                                        {{$like := "like"}} {{if .Favourited}} {{$like = "unlike"}} {{end}}
                                        <form class="status-like" data-action="{{$like}}" action="/{{$like}}/{{.ID}}" method="post" target="_self">
                                                <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
+                                               <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
                                                <input type="hidden" name="retweeted_by_id" value="{{.RetweetedByID}}">
                                                <input type="submit" value="{{$like}}" class="btn-link">
 -                                              <a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list"> 
 +                                              <a class="status-like-count" href="/likedby/{{.ID}}" title="click to see the the list">
                                                        {{if and (not $.Ctx.AntiDopamineMode) .FavouritesCount}}
                                                                ({{DisplayInteractionCount .FavouritesCount}})
                                                        {{end}}
Simple merge