X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=README.md;h=806ab5f7bc3ebb5c53993933218ec7b7064a4753;hb=10f2cde0b1d75fa023b00400162cb525e8719514;hp=7101371ba6009acf91438d79f4fa4e9a4f4c93e1;hpb=56b07d84c53a03eacecc7794ddea127677f6a8e5;p=quix0rs-gnu-social.git
diff --git a/README.md b/README.md
index 7101371ba6..806ab5f7bc 100644
--- a/README.md
+++ b/README.md
@@ -52,9 +52,7 @@ service, Identi.ca .
It is shared with you in hope that you too make an
service available to your users. To learn more,
please see the Open Software Service Definition
-1.1:
-
- http://www.opendefinition.org/ossd
+1.1:
### License
@@ -82,16 +80,16 @@ License along with this program, in the file "COPYING". If not, see
Documentation in the /doc-src/ directory is available under the
Creative Commons Attribution 3.0 Unported license, with attribution to
-"GNU social". See http://creativecommons.org/licenses/by/3.0/ for details.
+"GNU social". See for details.
CSS and images in the /theme/ directory are available under the
Creative Commons Attribution 3.0 Unported license, with attribution to
-"GNU social". See http://creativecommons.org/licenses/by/3.0/ for details.
+"GNU social". See for details.
Our understanding and intention is that if you add your own theme that
uses only CSS and images, those files are not subject to the copyleft
requirements of the Affero General Public License 3.0. See
-http://wordpress.org/news/2009/07/themes-are-gpl-too/ . This is not
+. This is not
legal advice; consult your lawyer.
Additional library software has been made available in the 'extlib'
@@ -102,10 +100,15 @@ for additional terms.
## New this version
-This is a security fix and bug fix release since 1.1.0,
-released 2 July 2012. All 1.1.0 sites should upgrade to this version.
+This is a security fix and bug fix release since 1.1.1-alpha2.
+The current release base version, 1.1.2, began work on 2014-10-25.
+All 1.1.1 sites should upgrade to this version.
+
+So far it includes the following changes:
+
+- XSS security fix (thanks Simon Waters, )
-It includes the following changes:
+Upgrades from _StatusNet_ 1.1.1 will also experience these improvements:
- Fixes for SQL injection errors in profile lists.
- Improved ActivityStreams JSON representation of activities and objects.
@@ -113,6 +116,7 @@ It includes the following changes:
- More robust handling of errors in distribution.
- Fix error in OStatus subscription for remote groups.
- Fix error in XMPP distribution.
+- Tracking of conversation URI metadata (more coherent convos)
### Troubleshooting
@@ -130,36 +134,34 @@ conflicts in your code.
### Unstable version
If you're adventurous or impatient, you may want
-to install the development version of
-StatusNet. To get it, use the git version control
-tool like so:
+to install the development version of GNU social.
+To get it, use the git version control tool
+ like so:
git clone git@gitorious.org:social/mainline.git
-Using it is a mixed bag. On the positive side, it
-usually includes the latest security and bug fix
-patches. On the downside, it may also include
-changes that require admin intervention (like
-running a script or even raw SQL!) that may not be
-documented yet. It may be a good idea to test this
-version before installing it on your production
-machines.
+In the current phase of development it is probably
+recommended to use git as a means to stay up to date
+with the source code. You can choose between these
+branches:
+- 1.1.x "stable", few updates, well tested code
+- master "testing", more updates, usually working well
+- nightly "unstable", most updates, not always working
-To keep it up-to-date, use 'git pull'. Watch for
-conflicts!
+To keep it up-to-date, use 'git pull'. Watch for conflicts!
## Further information
-There are several ways to get more information
-about GNU social.
+There are several ways to get more information about GNU social.
* The #social IRC channel on freenode.net .
-* The GNU social website
-* Following us on GNU social -- http://quitter.se/gnusocial
-* Following us on Twitter -- https://twitter.com/gnusocial
+* The GNU social website
+* Following us on GNU social --
* GNU social has a bug tracker for any defects you may find, or ideas for
- making things better. http://bugz.foocorp.net/
+ making things better.
+* Patches are welcome, either on the bug tracker or our repository at
+ Gitorious.
Credits
=======
@@ -218,6 +220,7 @@ Thanks to all of the StatusNet developers:
* Brion Vibber, StatusNet, Inc.
* James Walker, StatusNet, Inc.
* Samantha Doherty, designer, StatusNet, Inc.
+* Simon Waters, Surevine
### Extra special thanks to the GNU socialites