This commit is contained in:
splitt3r 2017-10-09 20:48:29 +02:00
Родитель baced68588
Коммит 5aa8d0269b
6 изменённых файлов: 83 добавлений и 40 удалений

Просмотреть файл

@ -1,3 +1,75 @@
# Changelog
All notable changes to this project will be documented in this file.
## 0.7.3
### Added
- French translations
- Nextcloud 12 compatibility
### Changed
- Removed some deprecated methods
- Hide usernames in extended anonymous polls
## 0.7.2
### Added
- Search for users / groups in "Select..." access type (similar to sharing dialog) (thanks @scroom)
- Bump OC version to 9.1
- Anonymous comments / polls
- Allow comments for unregistered / not logged in users
### Fixed
- Correctly store text votes (thanks @jaeger-sb @joergmschulz)
- Preselection on edit poll page
- Current selected access type is now clickable
- Remove unused share manager
## 0.7.1
### Added
- New UI (thanks @mcorteel)
- Search for users / groups (thanks @bodo1987)
### Fixed
- Several bug fixes
- Use correct timezone for date polls
- Link to poll
- Only display users / groups the user is member of (except admin) (thanks @bodo1987)
## 0.7.0
### Added
- Show user avatars
- Toggle all switch
- Show login screen before error
### Fixed
- Not set expire would lead to 2.1.1970 as expire date
- Invalid characters in url hash
- Empty description in edit
- Many text poll fixes
- Notification checkbox fixes
- Blank page fixes on empty votes
## 0.6.9.1
### Fixed
- Replaced placeholder images
- Minor fixes, including external votes
## 0.6.9
### Added
- Edit polls
### Changed
- New minimal version set to 8.1
### Fixed
- Replaced deprecated methods
- Switched from raw php to controller
- Fixed several bugs
- Edit poll access
- Vote page layout

Просмотреть файл

@ -1,5 +1,7 @@
# Polls
[![Build Status](https://travis-ci.org/nextcloud/polls.svg?branch=master)](https://travis-ci.org/nextcloud/polls)
This is a poll app, similar to doodle or dudle, for Nextcloud / ownCloud written in PHP and JS / jQuery.
It is a rework of the already existing [polls app](https://github.com/raduvatav/polls) written by @raduvatav.

Просмотреть файл

@ -188,21 +188,21 @@ class PageController extends Controller {
$msg .= "<br/><br/>";
$toname = $this->userMgr->get($notification->getUserId())->getDisplayName();
$toName = $this->userMgr->get($notification->getUserId())->getDisplayName();
$subject = $this->trans->t('ownCloud Polls - New Comment');
$fromaddress = Util::getDefaultEmailAddress('no-reply');
$fromname = $this->trans->t("ownCloud Polls") . ' (' . $from . ')';
$fromAddress = Util::getDefaultEmailAddress('no-reply');
$fromName = $this->trans->t("ownCloud Polls") . ' (' . $from . ')';
try {
$mailer = \OC::$server->getMailer();
$message = $mailer->createMessage();
$message->setSubject($subject);
$message->setFrom(array($fromaddress => $fromname));
$message->setTo(array($email => $toname));
$message->setFrom(array($fromAddress => $fromName));
$message->setTo(array($email => $toName));
$message->setHtmlBody($msg);
$mailer->send($message);
} catch (\Exception $e) {
$message = 'error sending mail to: ' . $toname . ' (' . $email . ')';
$message = 'Error sending mail to: ' . $toName . ' (' . $email . ')';
Util::writeLog("polls", $message, Util::ERROR);
}
}

Просмотреть файл

@ -1,30 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2017 Vinzenz Rosenkranz <vinzenz.rosenkranz@gmail.com>
*
* @author Kai Schröer <kai@schroeer.co>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Polls\Controller;
use \OCP\AppFramework\Controller;
class PollController extends Controller {
}

Просмотреть файл

@ -21,19 +21,19 @@
*
*/
use \OCP\User;
\OCP\Util::addStyle('polls', 'main');
\OCP\Util::addStyle('polls', 'createpoll');
\OCP\Util::addStyle('polls', 'jquery.datetimepicker');
\OCP\Util::addScript('polls', 'create_edit');
\OCP\Util::addScript('polls', 'jquery.datetimepicker.full.min');
$userId = $_['userId'];
$userMgr = $_['userMgr'];
$urlGenerator = $_['urlGenerator'];
$isUpdate = isset($_['poll']) && $_['poll'] !== null;
$isAnonymous = false;
$hideNames = false;
if ($isUpdate) {
$poll = $_['poll'];
$isAnonymous = $poll->getIsAnonymous();

Просмотреть файл

@ -21,7 +21,7 @@
*
*/
use \OCP\User;
use OCP\User;
\OCP\Util::addStyle('polls', 'main');
\OCP\Util::addStyle('polls', 'vote');
@ -46,7 +46,6 @@
} else {
$expired = time() > strtotime($poll->getExpire());
}
?>
<?php if($poll->getType() == '0') : ?>