From: Mikael Nordfeldth Date: Fri, 13 Feb 2015 11:08:54 +0000 (+0100) Subject: Updated README.md and framework.php X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b3e80f5c325eb7005ec4b2a904c9e8c8451453d2;p=quix0rs-gnu-social.git Updated README.md and framework.php --- diff --git a/README.md b/README.md index 806ab5f7bc..3d0e101d69 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# GNU social 1.1.2 (alpha) -August 2014 +# GNU social 1.1.3 (beta3) +February 2015 (c) Free Software Foundation, Inc (c) StatusNet, Inc @@ -41,13 +41,13 @@ 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, @@ -100,13 +100,15 @@ 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 a security fix and bug fix release since 1.1.3-beta2. +All 1.1.x sites should upgrade to this version. So far it includes the following changes: -- XSS security fix (thanks Simon Waters, ) +- XSS security fix (thanks Simon Waters, ) +- Many improvements to ease adoption of the Qvitter front-end +- Protocol adaptions for improved performance and stability +- Backing up a user's account now appears to work as it should Upgrades from _StatusNet_ 1.1.1 will also experience these improvements: @@ -154,14 +156,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 -- +* 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. -* Patches are welcome, either on the bug tracker or our repository at - Gitorious. + making things better. +* Patches are welcome, preferrably to our repository on Gitorious. Credits ======= @@ -221,6 +223,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 diff --git a/lib/framework.php b/lib/framework.php index 513416c082..c0c5146794 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -23,7 +23,7 @@ define('GNUSOCIAL_ENGINE', 'GNU social'); define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/'); define('GNUSOCIAL_BASE_VERSION', '1.1.3'); -define('GNUSOCIAL_LIFECYCLE', 'beta2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' +define('GNUSOCIAL_LIFECYCLE', 'beta3'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);