diff --git a/README.md b/README.md index 6ac1daee8b..ee1603dd00 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,18 @@ -# EGroupware +# EGroupware 17.1 | Branch | Status | Composer | | ------ | ------ | -------- | -| master | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=master)](https://travis-ci.org/EGroupware/egroupware) | [![Dependency Status](https://www.versioneye.com/user/projects/57527deb7757a00041b3a25e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/57527deb7757a00041b3a25e) | -| 16.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=16.1)](https://travis-ci.org/EGroupware/egroupware) | [![Dependency Status](https://www.versioneye.com/user/projects/57527e0c7757a0003bd4aecb/badge.svg?style=flat)](https://www.versioneye.com/user/projects/57527deb7757a00041b3a25e) | -| 14.2 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=14.2)](https://travis-ci.org/EGroupware/egroupware) | [![Dependency Status](https://www.versioneye.com/user/projects/57527e0c7757a0003bd4aecb/badge.svg?style=flat)](https://www.versioneye.com/user/projects/57527e0c7757a0003bd4aecb) | +| 17.1 | [![Build Status](https://travis-ci.org/EGroupware/egroupware.svg?branch=17.1)](https://travis-ci.org/EGroupware/egroupware) | [![Dependency Status](https://www.versioneye.com/user/projects/57527e0c7757a0003bd4aecb/badge.svg?style=flat)](https://www.versioneye.com/user/projects/57527deb7757a00041b3a25e) | ### Default and prefered installation method for EGroupware is via your package manager: https://software.opensuse.org/download.html?project=server%3AeGroupWare&package=egroupware-epl -### Installing EGroupware 16.1 from github: -[switch to 16.1 branch](https://github.com/EGroupware/egroupware/tree/16.1) and follow instructions there - -### Installing EGroupware development version: +### Installing EGroupware 17.1 from Github: * cd /path/to/your/docroot -* git clone https://github.com/EGroupware/egroupware.git # or git@github.com:EGroupware/egroupware.git for ssh +* git clone -b 17.1 https://github.com/EGroupware/egroupware.git # or git@github.com:EGroupware/egroupware.git for ssh * cd egroupware * install composer.phar from https://getcomposer.org/download/ * install myrepos (mr) from https://myrepos.branchable.com/ or your distribution package manager -* add a line /path/to/egroupware/.mrconfig to your ~/.mrtrust, to allow running composer.phar and git clone -b 16.1 +* add a line /path/to/egroupware/.mrconfig to your ~/.mrtrust, to allow running composer.phar and git clone -b 17.1 * mr up * enable further / non-default EGroupware apps by uncommenting them in .mrconfig and run mr up * continue installation at http://localhost/egroupware/setup/ @@ -26,3 +21,10 @@ * npm install -g grunt-cli # installs grunt command globally, if you have not already done so * npm install # installs required npm/grunt modules into node_modules/ dir * run grunt manually after every update, or better uncomment grunt steps in .mrconfig + +### Switching a git installation from master or 16.1 to 17.1: +``` +for d in . * activesync/vendor/z-push/z-push api/src/Db/ADOdb ; do [ -d $d/.git ] && (echo $d; cd $d; git checkout 17.1); done +``` + +For further instalation instructions see our wiki.