aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2014-01-13 00:13:54 +0100
committerSem <sembrestels@riseup.net>2014-01-13 00:13:54 +0100
commit9597739108437619a3a2acf8581f45caa623bb44 (patch)
tree88d3deacd48f49bb0c38b09584ed3896da75d936
parentca9d45d86bdba004877c4e386423f8347908280b (diff)
parent0581f68053380f55118b568a0ae70b9fd34b8dd1 (diff)
downloadelgg-9597739108437619a3a2acf8581f45caa623bb44.tar.gz
elgg-9597739108437619a3a2acf8581f45caa623bb44.tar.bz2
Merge branch 'release/1.8.1' into develop
-rw-r--r--README8
-rw-r--r--manifest.xml2
2 files changed, 5 insertions, 5 deletions
diff --git a/README b/README
index 24591c3..29a9f38 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
Widget Title
----------------------------
+===========
To change the widget title, edit the language file (en.php) and change the
string 'simplepie:widget' from 'RSS Feed' to whatever you desire.
Proxy Server
-----------------------------
+===========
If your site is going through a proxy server to get to the feeds, you may
want to increase the timeout on the feeds (though this is unlikely as the
default timeout is 10 seconds). You can do this by editing
@@ -14,6 +14,6 @@ uncomment the line $feed->set_timeout(20);
HTML tags in feeds
---------------------------
+=================
The widget allows the following tags: `<a><p><br><b><i><em><del><pre><strong><ul><ol><li><img>`.
-Other tags are stripped to avoid problems with the display of your site. \ No newline at end of file
+Other tags are stripped to avoid problems with the display of your site.
diff --git a/manifest.xml b/manifest.xml
index 94b8a4b..8be1bc3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
<name>SimplePie RSS Feed Integration</name>
<author>Cash Costello</author>
- <version>1.8.0</version>
+ <version>1.8.1</version>
<category>widget</category>
<description>Provides a widget that pulls in RSS feeds</description>
<website>http://www.cashcostello.com/</website>