Date poll with time span and only day events

.github/workflows/app-code-check.yml → .github/workflows/app-code-check-7.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['7.4']
-        server-versions: ['master', 'stable18', 'stable19', 'stable20']
+        server-versions: ['master', 'stable19', 'stable20']
 
     name: AppCode check php${{ matrix.php-versions }}-${{ matrix.server-versions }}
     steps:

.github/workflows/app-code-check-8.yml

@@ -0,0 +1,55 @@
+name: PHP AppCode Check
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - stable*
+
+env:
+  APP_NAME: polls
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-versions: ['8.0']
+        server-versions: ['master']
+
+    name: AppCode check php${{ matrix.php-versions }}-${{ matrix.server-versions }}
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v2
+        with:
+          repository: nextcloud/server
+          ref: ${{ matrix.server-versions }}
+
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+
+      - name: Checkout app
+        uses: actions/checkout@v2
+        with:
+          path: apps/${{ env.APP_NAME }}
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: phpunit
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
+
+      - name: Checkout app
+        uses: actions/checkout@v2
+        with:
+          path: apps/${{ env.APP_NAME }}
+
+      - name: App code check
+        run: php occ app:check-code ${{ env.APP_NAME }}

.github/workflows/backport.yml

@@ -0,0 +1,16 @@
+name: Backport
+on:
+  pull_request:
+    types:
+      - closed
+      - labeled
+
+jobs:
+  backport:
+    runs-on: ubuntu-18.04
+    name: Backport
+    steps:
+      - name: Backport
+        uses: tibdex/backport@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [7.4]
+        php-versions: [7.4, 8.0]
 
     name: php-cs
 

.github/workflows/phpunit.yml

@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['7.4', '8.0']
         databases: ['sqlite']
         server-versions: ['master']
 
@@ -48,7 +48,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
           coverage: none
 
       - name: Set up PHPUnit
@@ -79,7 +79,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0']
         databases: ['mysql']
         server-versions: ['master']
 
@@ -118,7 +118,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
+          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql, zip, gd
           coverage: none
 
       - name: Set up PHPUnit
@@ -149,7 +149,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
+        php-versions: ['7.4', '8.0']
         databases: ['pgsql']
         server-versions: ['master']
 
@@ -190,7 +190,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
+          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql, zip, gd
           coverage: none
 
       - name: Set up PHPUnit

CHANGELOG.md

@@ -1,16 +1,54 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [1.7.2 - beta3] - tbd
+## [1.8.0] - tbd
+ - [enhancement] - #1367 - Immediately adopt changes from other users to the current poll
+ - [fix] #1374 - fix uniqueContraintsException when shifting dates
+
+## [1.7.4] - 2021-01-30
+### new Features since 1.6.x
+ - Send invitations via notification app
+ - Reload current poll every 30 seconds for updates
+ - Admin users can delete and takeover polls from other users via new admin section
+ - Respect autocompletion limitations from share settings for users, group and circle searches
+ - Limit number of participants per option
+ - Limit number of votes per participant
+ - Combine registration dialogs into one dialog for public polls
+ - Show closed polls in the relevant list until four days after closing date
+ - Changed display of expiration timespan in polls overview
+ - Support dark mode and dark theme
+ - Compatible with Nextcloud 21
+ - Drop support for Nextcloud before 19
+
+### Bugfixes since 1.6.x
+ - Linebreaks in description were ignored
+ - Avoid concurrent long term user searches with a big user base
+ - Speed up poll overview, by avoiding unnecessary loading of polls, the user is not allowed to see
+ - Avoid duplicates in different tables
+ - Invalid string text in the email
+
+ See also https://github.com/nextcloud/polls/milestone/31?closed=1
+
+## [1.7.3 - RC1] - 2021-01-27
+ - [enhancement] #1358 - show closed polls in the relevant list until four days after closing date
+ - [enhancement] #1358 - add warning class to hints in the configuration
+ - [fix] #1355 - fix migration
+ - [fix] #1358 - detect conflicts after vote click, if limits are set and more than one user is voting
+ - [fix] #1358 - menu in poll list was not clickable
+ - [fix] #1357 - copy participants was broken
+ - [dependencies] Updated dependencies
+ - [dependencies] fix calendar popover (@nextcloud/vue@3.5.4)
+
+## [1.7.2 - beta3] - 2021-01-17
+ - [enhancement] #1338 - Support dark mode and dark theme
  - [fix] #1346 - user search broken
  - [fix] #1344 - prevent commenting, when entering public poll without registration  
- - [fix] #1338 - Support dark mode and dark theme
 
 ## [1.7.1 - beta2] - 2021-01-12
  - [fix] #1325 - There are no spaces in the column name  
  - [fix] #1326 - Invalid string text in the email
  - [enhancement] #739 - Limit number of participants per option
- - [enhancement] #738 - Limit numer of votes per participant (also #647, #624)
+ - [enhancement] #738 - Limit number of votes per participant (also #647, #624)
  - [dependencies] Updated dependencies
  - [refactoring] Mainly code maintenance and optimizations, bug fixes
 
@@ -26,7 +64,8 @@ All notable changes to this project will be documented in this file.
  - [fix] #1183 - Avoid concurrent long term user searches with a big user base
  - [fix] #1181 - Speed up poll overview, by avoiding unnecessary loading of polls, the user is not allowed to see
 
- See also https://github.com/nextcloud/polls/milestone/31?closed=1
+## [1.6.3] - 2020-11-23
+  - [fix] #1252 External user is not listed in admin's shares list
 
 ## [1.6.2] - 2020-11-19
  - [fix] Subscription was missing for logged in users

README.md

@@ -9,27 +9,32 @@ This is a poll app, similar to doodle or dudle, for Nextcloud written in PHP and
 
 ## Features
 - :bar_chart: Create / edit polls (datetimes and texts)
-- :date: Set an expiration date
+- :date: Set a closing date
 - :lock: Restrict access (all site users or invited users only)
 - :speech_balloon: Comments
-- Create public polls
-- Invite users, groups and contacts (directly or via circles or contact groups)
-- Hide results until the poll is closed
-- Create anonymised polls (participants names get pseudonymized for other users)
+- Share poll with users, groups, contacts and circles
+- Invite external users with a unique link or via email address
+- Hide results permanently or until the poll is closed
+- Confirm options after poll closing
+- Create anonymized polls (participants names get pseudonymized for other users)
+- Limit possible answers per option and per user
+- Subscribe to notifications
+- Get hints about possible conflicting entries in your calendar around the date option
+- Switch between list and table view
+- Configure your preferred view for date and text polls
 
 ## Bugs
 - https://github.com/nextcloud/polls/issues
 
-## Screenshots
+## Screenshots (table view)
 Create a new poll from the navigation bar and get an overview of your polls
 ![Overview](screenshots/overview.png)
 
-#### Vote and comment
+#### Vote and comment (list view)
 ![Vote](screenshots/vote.png)
 
 #### Edit poll inside the vote page
 ![Edit poll](screenshots/edit-poll.png)
-![Edit options](screenshots/options.png)
 
 #### Add shared links to your poll
 ![Share poll](screenshots/shares.png)
@@ -38,7 +43,7 @@ Create a new poll from the navigation bar and get an overview of your polls
 ![Vote mobile portrait](screenshots/mobile-portrait.png)
 
 ## Installation / Update
-This app is supposed to work on Nextcloud version 17+.
+This app is supposed to work on Nextcloud version 19+.
 
 ### Install latest release
 You can download and install the latest release from the [Nextcloud app store](https://apps.nextcloud.com/apps/polls).

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Polls</name>
     <summary>A polls app, similar to doodle/dudle with the possibility to restrict access.</summary>
     <description>A polls app, similar to doodle/dudle with the possibility to restrict access (members, certain groups/users, hidden and public).</description>
-    <version>1.7.2</version>
+    <version>1.8.0</version>
     <licence>agpl</licence>
     <author>Vinzenz Rosenkranz</author>
     <author>René Gieling</author>
@@ -29,9 +29,13 @@
 		<job>OCA\Polls\Cron\NotificationCron</job>
 	</background-jobs>
 	<repair-steps>
-        <pre-migration>
-            <step>OCA\Polls\Migration\DeleteDuplicates</step>
+		<pre-migration>
+            <step>OCA\Polls\Migration\RemoveIndices</step>
+			<step>OCA\Polls\Migration\DeleteDuplicates</step>
         </pre-migration>
+        <post-migration>
+            <step>OCA\Polls\Migration\CreateIndices</step>
+        </post-migration>
     </repair-steps>
 	<navigations>
         <navigation>

appinfo/routes.php

@@ -40,6 +40,7 @@
 		['name' => 'public#resend_invitation', 'url' => '/s/{token}/resend', 'verb' => 'GET'],
 		['name' => 'public#validate_public_username', 'url' => '/check/username', 'verb' => 'POST'],
 		['name' => 'public#validate_email_address', 'url' => '/check/emailaddress/{emailAddress}', 'verb' => 'GET'],
+		['name' => 'public#watch_poll', 'url' => '/s/{token}/watch', 'verb' => 'GET'],
 
 		['name' => 'admin#index', 'url' => '/administration', 'verb' => 'GET'],
 		['name' => 'admin#list', 'url' => '/administration/polls', 'verb' => 'GET'],
@@ -58,7 +59,7 @@
 
 		['name' => 'poll#switchDeleted', 'url' => '/poll/{pollId}/switchDeleted', 'verb' => 'PUT'],
 		['name' => 'poll#clone', 'url' => '/poll/{pollId}/clone', 'verb' => 'GET'],
-		['name' => 'poll#getParticipantsEmailAddresses', 'url' => '/polls/{pollId}/addresses', 'verb' => 'GET'],
+		['name' => 'poll#getParticipantsEmailAddresses', 'url' => '/poll/{pollId}/addresses', 'verb' => 'GET'],
 
 		['name' => 'option#list', 'url' => '/poll/{pollId}/options', 'verb' => 'GET'],
 		['name' => 'option#add', 'url' => '/option', 'verb' => 'POST'],
@@ -92,6 +93,7 @@
 		['name' => 'comment#delete', 'url' => '/comment/{commentId}', 'verb' => 'DELETE', 'postfix' => 'auth'],
 
 		['name' => 'system#user_search', 'url' => '/search/users/{query}', 'verb' => 'GET'],
+		['name' => 'watch#watch_poll', 'url' => '/poll/{pollId}/watch', 'verb' => 'GET'],
 
 		['name' => 'preferences#write', 'url' => '/preferences/write', 'verb' => 'POST'],
 		['name' => 'preferences#get', 'url' => '/preferences/get', 'verb' => 'GET'],

l10n/ca.js

@@ -2,16 +2,26 @@ OC.L10N.register(
     "polls",
     {
     "Contact" : "Contacte",
+    "Contact group" : "Grup de contactes",
+    "External Email" : "Correu electrònic extern",
     "Public link" : "Enllaç públic",
+    "External user" : "Usuari extern",
     "Group" : "Grup",
     "User" : "Usuari",
     "Polls" : "Enquestes",
+    "%s invited you to a poll" : "%s l'ha invitat a una enquesta",
+    "{user} has invited you to the poll \"%s\"." : "{user} l'ha invitat a l'enquesta \"%s\"",
+    "%s took over your poll" : "%s s'ha fet el càrrec de la vostra enquesta",
+    "{user} took over your poll \"%s\" and is the new owner." : "{user} s'ha fet càrrec de la vostra enquesta \"%s\" i és el nou propietari",
+    "%s permanently deleted your poll" : "%s s'ha suprimit de manera permanent la vostra enquesta",
     "- %s voted." : "- %s ha votat.",
+    "- The poll got deleted." : "- L'enquesta s'ha suprimit.",
+    "- The poll got restored." : "- L'enquesta s'ha restaurat.",
     "Polls App - New Activity" : "Aplicació d'Enquestes - Nova Activitat",
     "\"{title}\" had recent activity: " : "\"{title}\" ha tingut activitat recent: ",
     "A user" : "Un usuari",
     "Go to poll" : "Vés a l'enquesta",
-    "This email is sent to you, because you subscribed to notifications of this poll. To opt out, visit the poll and remove your subscription." : "Aquest correu electrònic s'envia a vostè, perquè es va subscriure a les notificacions d'aquesta enquesta. Per donar-se de baixa, visita l'enquesta i suprimeix la subscripció.",
+    "This email is sent to you, because you subscribed to notifications of this poll. To opt out, visit the poll and remove your subscription." : "Aquest correu electrònic s'envia, perquè et vas subscriure a les notificacions d'aquesta enquesta. Per donar-te de baixa, visita l'enquesta i elimina la subscripció.",
     "Poll invitation \"%s\"" : "Invitació a Enquesta \"%s\"",
     "{owner} invited you to take part in the poll \"{title}\"" : "{owner} us va convidar a participar en l'enquesta \"{title}\"",
     "This link gives you personal access to the poll named above. Press the button above or copy the following link and add it in your browser's location bar: " : "Aquest enllaç us dóna accés personal a l'enquesta que s'ha anomenat anteriorment. Premeu el botó de dalt o copieu l'enllaç següent i afegiu-lo a la barra d'ubicació del navegador: ",
@@ -35,20 +45,21 @@ OC.L10N.register(
     "Results are hidden." : "Els resultats estan ocults.",
     "The used time zone is {timeZone}." : "La zona horària utilitzada és {timeZone}.",
     "Public poll" : "Enquesta pública",
-    "To participate, tell us how we can call you!" : "Per participar-hi, explica'ns com podem trucar-te!",
+    "To participate, tell us how we can call you!" : "Per participar-hi, explica'ns com podem anomenar-te!",
     "Enter your name" : "Introdueix el teu nom",
     "Optional email address" : "Correu electrònic opcional",
     "Cancel" : "Cancel·la",
     "OK" : "D'acord",
     "Checking username …" : "S'està comprovant el nom d'usuari …",
     "Please use at least 3 characters." : "Si us plau, utilitzeu almenys 3 caràcters.",
     "This name is not valid." : "Aquest nom no és vàlid.",
-    "OK, we will call you {username}." : "D'acord, us trucarem {username}.",
+    "OK, we will call you {username}." : "D'acord, us anomenarem {username}.",
     "Checking email address …" : "Comprovació de l'adreça de correu electrònic …",
     " " : " ",
     "This email address is not valid." : "Aquesta adreça de correu no és vàlida",
     "This email address is valid." : "Aquesta adreça electrònica és vàlida.",
     "Error saving username" : "Error en desar el nom d'usuari",
+    "With your email address you can subscribe to notifications and you will receive your personal link to this poll." : "Introdueix la teva adreça de correu electrònic per poder subscriure't a les actualitzacions i obtenir el teu enllaç personal per correu electrònic.",
     "Enter a name to start the search" : "Introduïu un nom per iniciar la cerca",
     "Error while adding share" : "Error en afegir compartició",
     "Conflict" : "Conflicte",
@@ -60,9 +71,9 @@ OC.L10N.register(
     "Title" : "Títol",
     "Enter Title" : "Introduïu el títol",
     "Poll type" : "Tipus d'enquesta",
+    "Apply" : "Aplica",
     "Date poll" : "Enquesta de dates",
     "Text poll" : "Enquesta de text",
-    "Apply" : "Aplica",
     "Poll \"{pollTitle}\" added" : "S'ha afegit l'enquesta \"{pollTitle}\"",
     "Error while creating Poll \"{pollTitle}\"" : "S'ha produït un error en crear l'enquesta \"{pollTitle}\"",
     "Add new Poll" : "Afegeix una enquesta nova",
@@ -128,7 +139,6 @@ OC.L10N.register(
     "As an admin you may edit this poll" : "Com a administrador podeu editar aquesta enquesta",
     "Description" : "Descripció",
     "Poll configurations" : "Configuracions de l'enquesta",
-    "Allow \"maybe\" vote" : "Permet el vot \"potser\"",
     "Anonymous poll" : "Enquesta anònima",
     "Allow admins to edit this poll" : "Permet als administradors editar aquesta enquesta",
     "Relevant for all users" : "Rellevant per a tots els usuaris",