Fix previously merged pull-requests

2 files changed, 48 insertions, 48 deletions

diff --git a/.htaccess b/.htaccess
index 2125df50..9da74f57 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,14 +13,4 @@
     
     # RewriteCond %{HTTPS} !=on 
     # RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-    
-    ###########################
-    ## Notes:
-    ## The first directive will check to make sure the connection is not already HTTPS
-    ##
-    ## The second directive will redirect users from their original location, to the same location but using HTTPS.
-    ## i.e.  http://www.example.com/foo/ to https://www.example.com/foo/
-    ## The leading slash is made optional so that this will work either in httpd.conf
-    ## or .htaccess context
-    ############################    
 </IfModule>
diff --git a/ChangeLog b/ChangeLog
index 48e3560d..dd42b485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
-Version 1.0.35 (not released yet)
---------------------------------
+Version 1.0.36 (unreleased)
+---------------------------
+
+New features:
+
+Improvements:
+
+Bug fixes:
+
+
+Version 1.0.35 (Dec 4, 2016)
+----------------------------
 
 New features:
 
@@ -32,8 +42,8 @@ Bug fixes:
 * Fix link generation when user mention is followed by a punctuation mark
 * Make user mentions works again
 
-Version 1.0.34 (11 Oct 2016)
----------------------------
+Version 1.0.34 (Oct 11, 2016)
+-----------------------------
 
 New features:
 
@@ -64,8 +74,8 @@ Bug fixes:
 * Do not show closed tasks in task move position form
 * Avoid "Controller not found" in Settings > Links
 
-Version 1.0.33 (6 Sep 2016)
---------------------------
+Version 1.0.33 (Sep 5, 2016)
+----------------------------
 
 New features:
 
@@ -107,8 +117,8 @@ Bug fixes:
 * Fix wrong project date format (shown as 01/01/1970)
     - If the dates still not correct, modify and save the date
 
-Version 1.0.32 (1 Aug 2016)
---------------------------
+Version 1.0.32 (July 31, 2016)
+------------------------------
 
 New features:
 
@@ -148,8 +158,8 @@ Bug fixes:
 * Fixed Markdown editor auto-grow on the task form (Safari)
 * Fixed compatibility issue with PHP 5.3 for OAuthUserProvider class
 
-Version 1.0.31 (4 Jul 2016)
---------------------------
+Version 1.0.31 (Jul 3, 2016)
+----------------------------
 
 New features:
 
@@ -186,8 +196,8 @@ Breaking changes:
 
 * Docker volume paths are changed to /var/www/app/{data,plugins}
 
-Version 1.0.30 (9 Jun 2016)
---------------------------
+Version 1.0.30 (Jun 8, 2016)
+----------------------------
 
 Improvements:
 
@@ -199,8 +209,8 @@ Bug fixes:
 * Fixed plural form in alert message
 * Fixed CSS cosmetic issue with popover and tooltips
 
-Version 1.0.29 (6 Jun 2016)
---------------------------
+Version 1.0.29 (Jun 5, 2016)
+----------------------------
 
 New features:
 
@@ -241,8 +251,8 @@ Breaking changes:
 * All controllers have been renamed, people who are not using URL rewriting will see different URLs
 * All models have been renamed, plugin maintainers will have to update their plugins
 
-Version 1.0.28 (8 May 2016)
---------------------------
+Version 1.0.28 (May 8, 2016)
+----------------------------
 
 New features:
 
@@ -284,8 +294,8 @@ Bug fixes:
 * Fixed form submission with Meta+Enter keyboard shortcut
 * Removed PHP notices in comment suppression view
 
-Version 1.0.27 (28 Mar 2016)
----------------------------
+Version 1.0.27 (Mar 27, 2016)
+-----------------------------
 
 New features:
 
@@ -329,8 +339,8 @@ Bug fixes:
 * Fix invalid user filter for API procedure createLdapUser()
 * Ambiguous column name with very old version of Sqlite
 
-Version 1.0.26 (28 Feb 2016)
----------------------------
+Version 1.0.26 (Feb 28, 2016)
+-----------------------------
 
 Breaking changes:
 
@@ -362,8 +372,8 @@ Bug fixes:
 * Fix filter dropdown not accessible when there are too many items
 * Fix regression: unable to change project in "task move/duplicate to another project"
 
-Version 1.0.25 (7 Feb 2016)
---------------------------
+Version 1.0.25 (Feb 7, 2016)
+----------------------------
 
 Breaking changes:
 
@@ -409,8 +419,8 @@ Bug fixes:
 * Category label is broken on the board if there's a url in the description
 * Fix pagination on task time tracking page
 
-Version 1.0.24 (24 Jan 2016)
----------------------------
+Version 1.0.24 (Jan 23, 2016)
+-----------------------------
 
 New features:
 
@@ -451,8 +461,8 @@ Bug fixes:
 * Unable to unassign a task from the API
 * Revert back previous optimizations of TaskPosition (incompatibility with some environment)
 
-Version 1.0.23 (9 Jan 2016)
---------------------------
+Version 1.0.23 (Jan 9, 2016)
+----------------------------
 
 Breaking changes:
 
@@ -486,8 +496,8 @@ Bug fixes:
 * Fix pagination in group members listing
 * Avoid PHP error when enabling LDAP group provider with PHP < 5.5
 
-Version 1.0.22 (14 Dec 2015)
----------------------------
+Version 1.0.22 (Dec 13, 2015)
+-----------------------------
 
 Breaking changes:
 
@@ -516,8 +526,8 @@ New features:
 * Add capability to reopen Gitlab issues
 * Try to load config.php from /data if not available
 
-Version 1.0.21 (22 Nov 2015)
----------------------------
+Version 1.0.21 (Nov 22, 2015)
+-----------------------------
 
 Breaking changes:
 
@@ -555,8 +565,8 @@ Bug fixes:
 * Make CSV export compatible with PHP 5.3
 * Avoid Safari to append .html at the end of downloaded files
 
-Version 1.0.20 (25 Oct 2015)
----------------------------
+Version 1.0.20 (Oct 24, 2015)
+-----------------------------
 
 Breaking changes:
 
@@ -582,8 +592,8 @@ Bug fixes:
 * People should not see any tasks during a search when they are not associated to a project
 * Avoid disabling the default swimlane during renaming when there is no other activated swimlane
 
-Version 1.0.19 (11 Oct 2015)
----------------------------
+Version 1.0.19 (Oct 11, 2015)
+-----------------------------
 
 New features:
 
@@ -646,8 +656,8 @@ Bug fixes:
 * Fix Postgres issue "Cardinality violation" when there is multiple "is_milestone_of" links
 * Fix issue with due date greater than year 2038
 
-Version 1.0.18 (30 Aug 2015)
----------------------------
+Version 1.0.18 (Aug 30, 2015)
+-----------------------------
 
 New features:
 
@@ -693,8 +703,8 @@ Bug fixes:
 * Fix screenshot feature with Firefox 40
 * Fix bug when uploading files with Cyrilic characters
 
-Version 1.0.17 (26 Jul 2015)
----------------------------
+Version 1.0.17 (Jul 27, 2015)
+-----------------------------
 
 New features: