added changes frim the overlap time 3.6rc/develop

diff --git a/CHANGELOG b/CHANGELOG
index 0cb709a90fd315389d98c35b2ca1727dfc789992..6006ec5ef3e2c97ac6546d81babc4713e641a570 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,7 @@ Version 2018.05 (2018-05-xx)
     Enhancements to the themes (frio, vier) [astifter, fabrixxm, koyuawsmbrtn, M-arcus, MrPetovan, Quix0r, rabuzarus]
     Enhancements to the accessibility using the frio theme [annando]
     Enhancements to the display of the registration note and the privacy statements on the registration page [tobiasd]
-    Enhancements to the UI by clarification of the wording (deletion of items, network widget) [annando, tobiasd]
+    Enhancements to the UI by clarification of the wording (deletion of items, network widget, invitations) [annando, tobiasd]
     Enhancements to the background worker [annando]
     Enhancements to the forum display in the sidebar [annando]
     Enhancements to the testing system [rudloff, tobiasd]
@@ -24,6 +24,7 @@ Version 2018.05 (2018-05-xx)
     Enhancements to the API [rudloff]
     Enhancements to the systemd timer example [ben-utzer]
     Enhancements to the notification emails to better integrate the securemail addon [tobiasd]
+    Enhancements to the caching/loading mechanisms [MrPetovan]
     Fixed a bug in the relocation process of a Friendica instance [annando]
     Fixed a bug in the shell wrapper for the console [MrPetovan]
     Fixed a bug with the console tool po2php [MrPetovan]
@@ -47,6 +48,9 @@ Version 2018.05 (2018-05-xx)
     Fixed a bug that prevented the selection of displayed profiles for other Friendica contacts [MrPetovan]
     Fixed the version sorting in the federation statistics page [annando]
     Added an optional module to display the Terms of Service [tobiasd]
+    Added testfeed module [MrPetovan]
+    Added hashtag autocomplete (ported from Hubzilla) [rabuzarus]
+    Added password exposed check [MrPetovan]
     Added preloading config adapter [MrPetovan]
     Added a console to unify the PHP utility scripts [MrPetovan]
     Added a tool to set user passwords to the console [annando]