Merge branch '3.0'

# Conflicts:
#	css/css.php
#	inc/SP/Auth/Ldap/LdapBase.class.php
#	inc/SP/Auth/Ldap/LdapMsAds.class.php
#	inc/SP/Auth/Ldap/LdapStd.class.php
#	inc/SP/Controller/ChecksController.class.php
#	inc/SP/Controller/ConfigActionController.class.php
#	inc/SP/Core/Upgrade/Upgrade.class.php
#	inc/SP/Util/HttpUtil.class.php
#	inc/SP/Util/Util.class.php
#	inc/locales/de_DE/LC_MESSAGES/messages.mo
#	inc/locales/de_DE/LC_MESSAGES/messages.po
#	inc/locales/en_US/LC_MESSAGES/messages.mo
#	inc/locales/en_US/LC_MESSAGES/messages.po
#	inc/locales/pl_PL/LC_MESSAGES/messages.mo
#	inc/locales/pl_PL/LC_MESSAGES/messages.po
#	inc/sql/dbstructure.sql
#	inc/themes/material-blue/css/selectize.custom.min.css
#	inc/themes/material-blue/js/app-theme.js
#	inc/themes/material-blue/js/app-theme.min.js
#	inc/themes/material-blue/views/main/login.inc
#	js/app-main.min.js
#	js/app-triggers.js
#	js/app-triggers.min.js
#	lib/SP/Core/Language.php

.gitignore

@@ -45,10 +45,23 @@ crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-backup/*
-config/*
-res/
+app/cache/*
+app/backup/*
+app/config/*
+app/temp/*
+app/plugins/*
+app/modules/**/plugins/*
+!app/config/actions.xml
+!app/config/mime.xml
+!app/config/*.inc
+res/*
 tools/
-tmp/
+vendor/*
+doc/*
+build/*
+tests/_output/*
+
+.phpstorm.meta.php
+composer.phar
 
 !.blank

.travis.yml

@@ -0,0 +1,45 @@
+language: php
+
+sudo: false
+
+php:
+  - '7.0'
+  - '7.1'
+  - '7.2'
+
+branches:
+  only:
+  - 3.0
+
+addons:
+  mariadb: '10.1'
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter && ./cc-test-reporter before-build
+  - composer self-update
+  - composer install --prefer-source --no-interaction --dev
+
+script: ./vendor/bin/phpunit -c ./tests/phpunit.xml --testsuite Core
+
+after_script:
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then mv ./tests/_output/coverage-clover.xml clover.xml && ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -t clover; fi
+
+notifications:
+  email:
+    recipients:
+    - [email protected]
+    on_success: change # default: change
+    on_failure: always # default: always
+
+env:
+  - DB_SERVER=127.0.0.1 DB_NAME=syspass DB_USER=root DB_PASS=
+
+before_install:
+  - mysql -e 'DROP DATABASE IF EXISTS `'"$DB_NAME"'`;'
+  - mysql -e 'CREATE DATABASE `'"$DB_NAME"'` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
+  - mysql $DB_NAME < ./schemas/dbstructure.sql
+
+cache:
+  directories:
+  - vendor

INSTALL

@@ -40,4 +40,3 @@ Telepítés és gyakran feltett kérdésekre https://doc.syspass.org
 Installation et Foire aux questions du https://doc.syspass.org
 
 ---
-

README.md

@@ -2,24 +2,26 @@
 
 ## sysPass - Systems Password Manager
 
-[![Join the chat at https://gitter.im/sysPass/Lobby](https://badges.gitter.im/sysPass/Lobby.svg)](https://gitter.im/sysPass/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.org/nuxsmin/sysPass.svg?branch=devel-3.0)](https://travis-ci.org/nuxsmin/sysPass)  [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nuxsmin/sysPass/badges/quality-score.png?b=devel-3.0)](https://scrutinizer-ci.com/g/nuxsmin/sysPass/?branch=devel-3.0)
+
+[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/nuxsmin/sysPass.svg)](http://isitmaintained.com/project/nuxsmin/sysPass "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/nuxsmin/sysPass.svg)](http://isitmaintained.com/project/nuxsmin/sysPass "Percentage of issues still open")
+
+Join us in the Gitter chat room: [![Join the chat at https://gitter.im/sysPass/Lobby](https://badges.gitter.im/sysPass/Lobby.svg)](https://gitter.im/sysPass/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 
 
 ----------------
 
-Gestor de Claves web basado en PHP para uso empresarial y personal.
+### v3.0-beta
+
+This is the upcoming release and currently is on beta stage.
 
-- [x] Encriptación AES-256 en modo CTR
-- [x] RSA para envío de claves desde formularios
-- [x] Autentificación en 2 pasos
-- [x] Interfaz en HTML5 y Ajax
-- [x] Gestión de usuarios, grupos y perfiles con 29 niveles de acceso
-- [x] Autentificación con MySQL, OpenLDAP y Active Directory
-- [x] Etiquetas, campos personalizados, enlaces públicos, cuentas privadas, favoritos, historial, etc. 
-- [x] Avisos por email e in-app de actividad, y registro de acciones y eventos
-- [x] Multilenguaje
-- [x] API
+You can test some PHP flavours on:
 
-Detalles de instalación y documentación en Doc https://doc.syspass.org
+* PHP 7.0 - http://demo-beta.syspass.org:10080
+* PHP 7.1 - http://demo-beta.syspass.org:10081
+* PHP 7.2 - http://demo-beta.syspass.org:10082
+
+The best way to run sysPass v3 is by running on Docker containers. Please, check it out on 
+https://hub.docker.com/r/nuxsmin/docker-syspass/
 
 ----------------
 
@@ -32,9 +34,9 @@ PHP web based Password Manager for business and personal use.
 - [x] Users, groups and profiles management with up to 29 access levels
 - [x] MySQL, OpenLDAP and Active Directory authentication
 - [x] Tags, custom fields, public links, private accounts, favorites, history, etc.
-- [x] Activity notices by email and in-app, and event log
+- [x] Activity notifications by email and in-app, and event log
 - [x] Multilanguage
-- [x] API
+- [x] JSON-RPC API
 
 Installation instructions and documentation at Doc https://doc.syspass.org
 
@@ -44,26 +46,15 @@ Installation instructions and documentation at Doc https://doc.syspass.org
 
 ----------------
 
-#### ACTUALIZAR / UPDATE
-
-Para actualizar desde versiones anteriores seguir los pasos en http://doc.syspass.org/es/updating/v2_1.html
-
-In order to update from earlier versions you need to follow the steps on http://doc.syspass.org/en/updating/v2_1.html
-
-----------------
-
-Esta aplicación está bajo licencia GNU GPLv3. Para más detalles sobre la misma, 
-en el archivo COPYING se encuentra una copia de esta.
-
 This software is published under GNU GPLv3 license. For details about that, there is
 a copy on 'COPYING' file.
 
 ----------------
 
 https://syspass.org
 
-https://demo.syspass.org
-
 https://doc.syspass.org
 
 https://github.com/nuxsmin/sysPass
+
+https://hub.docker.com/r/nuxsmin/docker-syspass/