From 0a18e0944077cdcfc9ca1a7f3533b1d3d79e7428 Mon Sep 17 00:00:00 2001 From: Genma Date: Mon, 18 Sep 2017 15:11:17 +0200 Subject: [PATCH 1/6] Cryptad version in Readme.md added Because this information was lacking and I need to find it quickly (and probably other people). Don't forget to update this part at each new released. --- readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.md b/readme.md index 956077d15..5d88db1c8 100644 --- a/readme.md +++ b/readme.md @@ -16,6 +16,10 @@ Installing CryptPad is pretty straightforward. You can read all about it in the It also contains information on keeping your instance of CryptPad up to date. +## Current version + +CryptPad v1.15.0 (Poukai) released the 12th September 2017 + ## Setup using Docker See [Cryptpad-Docker](docs/cryptpad-docker.md) From 2ceb925d9bcf28ffca8e2cf48bff5cf3758374ac Mon Sep 17 00:00:00 2001 From: Genma Date: Mon, 18 Sep 2017 16:11:40 +0200 Subject: [PATCH 2/6] Link to cryptad releases documentation added. --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 5d88db1c8..2d46155af 100644 --- a/readme.md +++ b/readme.md @@ -19,6 +19,7 @@ It also contains information on keeping your instance of CryptPad up to date. ## Current version CryptPad v1.15.0 (Poukai) released the 12th September 2017 +See [Cryptad-Releases](docs/releases) ## Setup using Docker From d4cd67f7a769e12a80039c71badaaef01eca4506 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 10 Oct 2017 13:26:31 +0200 Subject: [PATCH 3/6] update current version of readme --- readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 2d46155af..04d4e2ef2 100644 --- a/readme.md +++ b/readme.md @@ -18,8 +18,7 @@ It also contains information on keeping your instance of CryptPad up to date. ## Current version -CryptPad v1.15.0 (Poukai) released the 12th September 2017 -See [Cryptad-Releases](docs/releases) +The most recent version and all past release notes can be found [here](https://github.com/xwiki-labs/cryptpad/releases/). ## Setup using Docker From fe3bea877d9fb9fe22b207aa4c2c534edbc5e49a Mon Sep 17 00:00:00 2001 From: Emil Suleymanov Date: Wed, 11 Oct 2017 00:47:03 +0200 Subject: [PATCH 4/6] Add dots Yep, just dots. --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 04d4e2ef2..9d32288ce 100644 --- a/readme.md +++ b/readme.md @@ -22,11 +22,11 @@ The most recent version and all past release notes can be found [here](https://g ## Setup using Docker -See [Cryptpad-Docker](docs/cryptpad-docker.md) +See [Cryptpad-Docker](docs/cryptpad-docker.md). ## Setup using Ansible -See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad) +See [Ansible Role for Cryptpad](https://github.com/systemli/ansible-role-cryptpad). # Security @@ -79,7 +79,7 @@ If you have any questions or comments, or if you're interested in contributing t This software is and will always be available under the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. If you wish to use this technology in a proprietary product, please contact -sales@xwiki.com +sales@xwiki.com. [ChainPad]: https://github.com/xwiki-contrib/chainpad [active attack]: https://en.wikipedia.org/wiki/Attack_(computing)#Types_of_attacks From 86767184daca9afee86fe583b089cef3cff45098 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 11 Oct 2017 15:37:11 +0200 Subject: [PATCH 5/6] Fix style issues in poll for Edge --- www/poll/app-poll.less | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less index dd3b3b91f..5ee093b3e 100644 --- a/www/poll/app-poll.less +++ b/www/poll/app-poll.less @@ -83,6 +83,7 @@ input[type="text"][disabled]::placeholder { table#cp-app-poll-table { margin: 0px; + overflow: hidden; } #cp-app-poll-table-container { position: relative; @@ -235,22 +236,8 @@ div.cp-app-poll-realtime { background-color: @poll-uncommitted-cell !important; } div.cp-app-poll-table-text-cell { - display: flex; - align-items: center; background-color: @poll-uncommitted-bg !important; color: @poll-uncommitted-text !important; - input { - order: 2; - flex: 1; - //width: ~"calc(100% - 80px)" !important; - //vertical-align: middle; - } - .cp-app-poll-table-remove { - order: 1; - } - .cp-app-poll-table-edit { - order: 3; - } } text-align: center; background-color: @poll-uncommitted-bg !important; @@ -292,9 +279,17 @@ div.cp-app-poll-realtime { margin: 0px; height: 100%; + display: flex; + align-items: center; + .cp-app-poll-table-remove { + order: 1; + } + .cp-app-poll-table-edit { + order: 3; + } input { - width: 80%; - width: 90%; + order: 2; + flex: 1; height: 100%; border: 0px; margin: 2px; From 54b5a2d6544af9691d019aa2a7e7d75e24d71fad Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 11 Oct 2017 16:01:26 +0200 Subject: [PATCH 6/6] Fix style issues in poll (Chrome) --- www/poll/app-poll.less | 10 +++++----- www/poll/inner.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less index 5ee093b3e..7d2cf1216 100644 --- a/www/poll/app-poll.less +++ b/www/poll/app-poll.less @@ -28,7 +28,7 @@ @poll-uncommitted-bg: #ddd; //lighten(@poll-th-bg, 50%); @poll-uncommitted-text: black; -@poll-placeholder: #666; +@poll-placeholder: #fff; @poll-border-color: #555; @poll-cover-color: #000; @poll-fg: #000; @@ -77,7 +77,7 @@ input[type="text"][disabled], textarea[disabled] { // The placeholder color only seems to effect Safari when not set input[type="text"][disabled]::placeholder { - //color: @poll-placeholder; + color: @poll-placeholder; opacity: 1; } @@ -275,10 +275,9 @@ div.cp-app-poll-realtime { margin: 0px; div.cp-app-poll-table-text-cell { + height: 28px; padding: 0px; margin: 0px; - height: 100%; - display: flex; align-items: center; .cp-app-poll-table-remove { @@ -288,9 +287,10 @@ div.cp-app-poll-realtime { order: 3; } input { + min-width: 0; order: 2; flex: 1; - height: 100%; + height: 24px; border: 0px; margin: 2px; &[disabled] { diff --git a/www/poll/inner.js b/www/poll/inner.js index c2da2e8ea..b6811dc80 100644 --- a/www/poll/inner.js +++ b/www/poll/inner.js @@ -264,7 +264,7 @@ define([ }; var styleUncommittedColumn = function () { var $scroll = $('#cp-app-poll-table-scroll'); - var hasScroll = $scroll.width() < $scroll[0].scrollWidth; + var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100; APP.uncommitted.content.colsOrder.forEach(function(id) { // Enable the checkboxes for the uncommitted column enableColumn(id); @@ -331,7 +331,7 @@ define([ }; var addCount = function () { var $scroll = $('#cp-app-poll-table-scroll'); - var hasScroll = $scroll.width() < $scroll[0].scrollWidth; + var hasScroll = $scroll.width() < $scroll[0].scrollWidth && $scroll.width() > 100; var $countCol = $('tr td:last-child'); if (hasScroll) { $countCol.css('right', '0');