diff options
| author | Sem <sembrestels@riseup.net> | 2013-11-10 09:45:26 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2013-11-10 09:45:26 +0100 |
| commit | 673932bc46a3918293a28c2c2fc622b3e5ff6bde (patch) | |
| tree | 4cd7d07130d2d4c4f5bd7c16d02ac1a258b97a21 | |
| parent | adf5420ef563f7ba9db7c8759e9f540922d3e68b (diff) | |
| parent | abc688bc155583a522beb1107e8ee35f98656e84 (diff) | |
| download | elgg-673932bc46a3918293a28c2c2fc622b3e5ff6bde.tar.gz elgg-673932bc46a3918293a28c2c2fc622b3e5ff6bde.tar.bz2 | |
Merge commit 'abc688bc15' into develop
| -rw-r--r-- | README.md | 28 | ||||
| -rw-r--r-- | README.txt | 24 |
2 files changed, 28 insertions, 24 deletions
diff --git a/README.md b/README.md new file mode 100644 index 000000000..a1b3e1cbf --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +Lorea +===== + +(Re-)Taking the Networks! + +The [lorea](https://lorea.org) code aims at providing individuals and teams with privacy-aware, security-conscious, and user-controlled-data collaborative tools over the Web, and around it. + +The main application is based on [Elgg](http://elgg.org), a PHP-based social networking platform. Lorea extends it with plugins to provide better privacy features, including strong encryption, *OStatus-based federation* with other Lorea/Elgg installations and OStatus-compliant projects, etc. + +It also integrates other popular technologies such as [DokuWiki](http://www.dokuwiki.org), [Etherpad](http://etherpad.org), [XMPP](http://xmpp.org), etc., and provides *GPG-encrypted mailing-lists* to groups. + +### Installation + +Our code is divided in two git repositories: elgg and lorea-plugins. You can get it using the following commands. + +<pre> +$ git clone git://gitorious.org/lorea/elgg.git +$ cd elgg +$ git remote add lorea-plugins git://gitorious.org/lorea/lorea-plugins.git +$ git pull lorea-plugins master +</pre> + +You can update the code to the latest release using: + +<pre> +$ git pull origin master +$ git pull lorea-plugins master +</pre> diff --git a/README.txt b/README.txt deleted file mode 100644 index dd604fd2b..000000000 --- a/README.txt +++ /dev/null @@ -1,24 +0,0 @@ -Elgg -Copyright (c) 2008-2013 See COPYRIGHT.txt - -See CONTRIBUTORS.txt for development credits. - -Elgg is managed by the Elgg Foundation, a nonprofit organization that was -founded to govern, protect, and promote the Elgg open source social network -engine. The Foundation aims to provide a stable, commercially and -individually independent organization that operates in the best interest of Elgg -as an open source project. - -The project site can be found at http://elgg.org/ - -The Elgg project was started in 2004 by: -Ben Werdmuller <ben@benwerd.com, http://benwerd.com> and -Dave Tosh <davidgtosh@gmail.com> - -Elgg is released under the GNU General Public License (GPL) Version 2 and the -Massachusetts Institute of Technology (MIT) License. See LICENSE.txt -in the root of the package you downloaded. - -For installation instructions, see INSTALL.txt. - -For upgrade instructions, see UPGRADE.txt. |