Changeset - 266644662a6a
[Not reviewed]
Merge
0 3 3
eximious - 12 months ago 2020-02-07 15:39:53
deb@seagl.org
Merge branch 'master' of ssh://k.sfconservancy.org/website
5 files changed with 7 insertions and 7 deletions:
0 comments (0 inline, 0 general)
www/conservancy/apps/blog/models.py
Show inline comments
...
 
@@ -60,9 +60,9 @@ class Entry(models.Model, bsoup.SoupModelMixin):
 
            super(Entry, self).save()
 
            return
 

	
 
        blog_name = 'Software Freedom Law Center Blog'
 
        blog_url =  'http://www.softwarefreedom.org/blog/'
 
        post_url = ('http://www.softwarefreedom.org'
 
        blog_name = 'Software Freedom Conservancy Blog'
 
        blog_url =  'http://www.sfconservancy.org/blog/'
 
        post_url = ('http://www.sfconservancy.org'
 
                    + self.get_absolute_url())
 

	
 
        import xmlrpclib
www/conservancy/apps/news/models.py
Show inline comments
...
 
@@ -48,9 +48,9 @@ class PressRelease(models.Model, bsoup.SoupModelMixin):
 
            super(PressRelease, self).save()
 
            return
 

	
 
        blog_name = 'Software Freedom Law Center News'
 
        blog_url =  'http://www.softwarefreedom.org/news/'
 
        post_url = ('http://www.softwarefreedom.org'
 
        blog_name = 'Software Freedom Conservancy News'
 
        blog_url =  'https://www.sfconservancy.org/news/'
 
        post_url = ('https://www.sfconservancy.org'
 
                    + self.get_absolute_url())
 

	
 
        import xmlrpclib
www/conservancy/static/img/2016_Edward-Snowden_CC-BY-SA-4.0.jpg
Show inline comments
 
new file 100644
 
binary diff not shown
Show images
www/conservancy/static/img/2020_Leslie-Hawthorn.jpg
Show inline comments
 
new file 100644
 
binary diff not shown
Show images
www/conservancy/templates/feeds/blog_description.html
Show inline comments
 
<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@softwarefreedom.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
 
<p><i>Blog post by <strong>{{ obj.author.formal_name }}</strong>.  Please email any comments on this entry to <a href="mailto:{{ obj.author.username }}@sfconservancy.org">&lt;{{ obj.author.username }}@sfconservancy.org&gt;</a>.</i></p>
 
{{ obj.body|safe }}
0 comments (0 inline, 0 general)