From 2f14ec78329cdd894048dd0e8339445309cdf019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Tue, 6 Feb 2018 21:36:50 +0100
Subject: [PATCH] Updated CHANGELOG.md, name fix

---
 CHANGELOG.md        | 13 ++++++++++++-
 templates/admin.php |  8 ++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fad3c87..e26b646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [3.1.0] - 2018-02-06
 ### Added
 - Column autocomplete for PostgreSQL
 - Currently supported parameters in README.md
+- SALT support for password algorithms "system" and "password_hash"
+### Changed
+- Updated README.me file
+- Nextcloud 12 & 13 support
+- Moved files to be more on the standard places
+- Renamed some files to be more standard like
+- Source code changes to be more standard like (max 80 characters)
 ### Fixed
 - Column autocomplete in "Groups Settings"
+- Security fix for password length sniffing attacks
+- Small bug fixes
+## Removed
+- Code for supervisor mode
 
 ## [2.4.0] - 2017-12-26
 ### Added
diff --git a/templates/admin.php b/templates/admin.php
index d7f7048..2799a3b 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -100,7 +100,7 @@
            <p><label for="col_email"><?php p($l -> t('E-Mail Column')); ?></label><input type="text" id="col_email" name="col_email" value="<?php p($_['col_email']); ?>" /></p>
 
             <p><label for="set_mail_sync_mode"><?php p($l -> t('E-Mail address sync mode')); ?></label>
-                <?php $mail_modes = array('none' => 'No Synchronisation', 'initial' => 'Synchronise only once', 'forceoc' => 'ownCloud always wins', 'forcesql' => 'SQL always wins'); ?>
+                <?php $mail_modes = array('none' => 'No Synchronisation', 'initial' => 'Synchronise only once', 'forceoc' => 'Nextcloud always wins', 'forcesql' => 'SQL always wins'); ?>
                 <select id="set_mail_sync_mode" name="set_mail_sync_mode">
                     <?php
                     foreach ($mail_modes as $mode => $name):
@@ -161,11 +161,11 @@
         </fieldset>
         <fieldset id="sql-6">
             <p><label for="sql_group_table"><?php p($l -> t('Table')); ?></label><input type="text" id="sql_group_table" name="sql_group_table" value="<?php p($_['sql_group_table']); ?>" /></p>
-            
+
             <p><label for="col_group_username"><?php p($l -> t('Username Column')); ?></label><input type="text" id="col_group_username" name="col_group_username" value="<?php p($_['col_group_username']); ?>" /></p>
-            
+
             <p><label for="col_group_name"><?php p($l -> t('Group Name Column')); ?></label><input type="text" id="col_group_name" name="col_group_name" value="<?php p($_['col_group_name']); ?>" /></p>
-            
+
         </fieldset>
 
         <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']); ?>" id="requesttoken" />