Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 124 insertions, 0 deletions

diff --git a/plugins/acl/skins/larry/acl.css b/plugins/acl/skins/larry/acl.css
new file mode 100644
index 000000000..bd72b3c85
--- /dev/null
+++ b/plugins/acl/skins/larry/acl.css
@@ -0,0 +1,124 @@
+#aclcontainer
+{
+  overflow-x: auto;
+  border: 1px solid #CCDDE4;
+  background-color: #D9ECF4;
+  height: 272px;
+  box-shadow: none;
+}
+
+#acllist-content
+{
+  position: relative;
+  height: 230px;
+  background-color: white;
+}
+
+#acllist-footer
+{
+  position: relative;
+}
+
+#acltable
+{
+  width: 100%;
+  border-collapse: collapse;
+  border: none;
+}
+
+#acltable th,
+#acltable td
+{
+  white-space: nowrap;
+  text-align: center;
+}
+
+#acltable thead tr th
+{
+  font-size: 11px;
+  font-weight: bold;
+}
+
+#acltable tbody td
+{
+  text-align: center;
+  height: 16px;
+  cursor: default;
+}
+
+#acltable thead tr > .user
+{
+  width: 30%;
+  border-left: none;
+}
+
+#acltable.advanced thead tr > .user {
+  width: 25%;
+}
+
+#acltable tbody td.user
+{
+  text-align: left;
+}
+
+#acltable tbody td.partial
+{
+  background-image: url(images/partial.png);
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+#acltable tbody td.enabled
+{
+  background-image: url(images/enabled.png);
+  background-position: center;
+  background-repeat: no-repeat;
+}
+
+#acltable tbody tr.selected td.partial
+{
+  background-color: #019bc6;
+  background-image: url(images/partial.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/partial.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+  background-image: url(images/partial.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/partial.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/partial.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
+}
+
+#acltable tbody tr.selected td.enabled
+{
+  background-color: #019bc6;
+  background-image: url(images/enabled.png), -moz-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/enabled.png), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#019bc6), color-stop(100%,#017cb4));
+  background-image: url(images/enabled.png), -o-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/enabled.png), -ms-linear-gradient(top, #019bc6 0%, #017cb4 100%);
+  background-image: url(images/enabled.png), linear-gradient(top, #019bc6 0%, #017cb4 100%);
+}
+
+#aclform
+{
+  display: none;
+}
+
+#aclform div
+{
+  padding: 0;
+  text-align: center;
+  clear: both;
+}
+
+#aclform ul
+{
+  list-style: none;
+  margin: 0.2em;
+  padding: 0;
+}
+
+#aclform ul li label
+{
+  margin-left: 0.5em;
+}
+
+ul.toolbarmenu li span.delete {
+  background-position: 0 -1509px;
+}