Merge branch 'master' into release-1.0

CHANGELOG

@@ -1,6 +1,11 @@
 Roundcube Webmail GlobalAddressbook
 ===================================
 
+Version 1.11 (2018-03-11, rc-1.0)
+=================================================
+ * Include plugin in all tasks
+ * Better support when using regex for admin ids
+
 Version 1.10 (2017-05-19, rc-1.0)
 =================================================
  * Add %i macro to get domain from default identity

README.md

@@ -72,8 +72,8 @@ if the address book is set to read only. The follow options are available:
   'admin@domain.com'
 * If you wish give admin rights to multiple users then enter the usernames in
   an array like: array('admin1@domain.com', 'admin2@domain.com')
-* You can also use regual expressions to match the admin username, regular
-  expressions must be started and finished the a '/'. Eg: '/^admin@/'
+* You can also use regular expressions to match the admin username.
+  Eg: '/^admin@/i'
 
 **'autocomplete'**
 
@@ -85,4 +85,4 @@ Use addresses in the global address book to identify known senders before
 displaying remote inline images in HTML messages (in addition to other
 configured address books).
 
-[gpl]: http://www.gnu.org/licenses/gpl.html
+[gpl]: https://www.gnu.org/licenses/gpl.html

composer.json

@@ -2,10 +2,10 @@
   "name": "johndoh/globaladdressbook",
   "description": "Add a global address book to Roundcube",
   "keywords": ["global","address","book"],
-  "homepage": "http://github.com/JohnDoh/Roundcube-Plugin-Global-Address-Book/",
+  "homepage": "https://github.com/johndoh/roundcube-globaladdressbook/",
   "license": "GPL-3.0",
   "type": "roundcube-plugin",
-  "version": "1.10",
+  "version": "1.11",
   "authors": [
     {
       "name": "Philip Weir",
@@ -16,7 +16,7 @@
   "repositories": [
     {
       "type": "composer",
-      "url": "http://plugins.roundcube.net"
+      "url": "https://plugins.roundcube.net"
     }
   ],
   "require": {