X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=README.md;h=7dfe8ae05c0001b7d0660abd3f3bf89231c9440f;hb=924bcd93e5692288f976dd49f15ea3e15c080acc;hp=0bf73ae44cc051f6156dd38ec7e5829595852cbd;hpb=8ad4d1baf89d2853c476b902159abbc1a69be8a1;p=quix0rs-gnu-social.git
diff --git a/README.md b/README.md
index 0bf73ae44c..7dfe8ae05c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# GNU social 1.1.2 (alpha)
-August 2014
+# GNU social 1.2.x
+2015
(c) Free Software Foundation, Inc
(c) StatusNet, Inc
@@ -32,8 +32,8 @@ polls, announce events, or other social activities
(and you can add more!). Users can choose which
people to "follow" and receive only their friends'
or colleagues' status messages. It provides a
-similar service to sites like Twitter, Google+ or
-Facebook, but is much more awesome.
+similar service to proprietary social network sites,
+but is much more awesome.
With a little work, status messages can be sent to
mobile phones, instant messenger programs (using
@@ -41,20 +41,18 @@ XMPP), and specially-designed desktop clients that
support the Twitter API.
GNU social supports an open standard called
-OStatus that lets users in
+OStatus that lets users in
different networks follow each other. It enables a
distributed social network spread all across the
Web.
-GNU social was originally developed for the
-service, Identi.ca .
+GNU social was originally developed as "StatusNet" by
+StatusNet, Inc. with Evan Prodromou as lead developer.
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,13 +100,19 @@ for additional terms.
## New 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.
+This is the development branch for the 1.2.x version of GNU social.
+All daring 1.1.x admins should upgrade to this version.
So far it includes the following changes:
-- XSS security fix (thanks Simon Waters, https://www.surevine.com/ )
+- Backing up a user's account is more and more complete.
+- Emojis ð¸ (utf8mb4 support)
+
+The last release, 1.1.3, gave us these improvements:
+
+- XSS security fix (thanks Simon Waters, )
+- Many improvements to ease adoption of the Qvitter front-end
+- Protocol adaptions for improved performance and stability
Upgrades from _StatusNet_ 1.1.1 will also experience these improvements:
@@ -140,13 +144,13 @@ 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
+ git clone git@git.gnu.io:gnu/gnu-social.git
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
+- 1.2.x "stable", few updates, well tested code
- master "testing", more updates, usually working well
- nightly "unstable", most updates, not always working
@@ -156,14 +160,14 @@ To keep it up-to-date, use 'git pull'. Watch for conflicts!
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
+* The #social IRC channel on freenode.net .
+* The unofficial XMPP room linked to IRC on
+* 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/
-* Patches are welcome, either on the bug tracker or our repository at
- Gitorious. https://gitorious.org/social/mainline
+ making things better.
+* Patches are welcome, preferrably to our repository on git.gnu.io.
Credits
=======
@@ -223,6 +227,7 @@ Thanks to all of the StatusNet developers:
* James Walker, StatusNet, Inc.
* Samantha Doherty, designer, StatusNet, Inc.
* Simon Waters, Surevine
+* Joshua Judson Rosen (rozzin)
### Extra special thanks to the GNU socialites
@@ -243,4 +248,3 @@ built the fediverse network to what it is today.
### License help from
* Bradley M. Kuhn
-