Skip to content

Commit

Permalink
Version 0.8.1 (#260)
Browse files Browse the repository at this point in the history
* some design changes

* Removed hidden-dates

* Added compiles css

* Updates

* Translations (#216)

* [tx-robot] updated from transifex

* make strings translatable

* Updates

* removed webkit-*

* Flex and sidebar

* manually sync l10n with master

* Removed some nonsense

* edited / added no access teplate

Added no.create and no.delete templates and changed desing a little bit.

* "some" work

* Manual update of l10n

* Added some responsive css

* Added responsive to vote page

* some more overwork

* fixed avatar load

* Hide header elements on public pages

* css updates

* Favicons

Added favicons and removed 	unnecessary tags from svgs

* Corrected xml tags

* fixed froken svg

* tidy

* fixes

* last sync

* time zone fix

* updated app icon

* toggle sidebar

* Some css fixes

* print desc unescaped, contains html

* Eliminated unvoted and some css fixes

* Fix box-sizing

* Adjusted height and width of favicon

* removed duplicate copy link

* Update

* Removed Strict Equality Comparison

This caused errors because of type mismatches. Fixes edit polls.

* Added Unit tests (#224)

* Added first unit test

* Fixed user constraint problem

* Fix tests

* Update CommentMapperTest.php

* Fixed FactoryMuffin + unit tests

* Fixed PHP 5.6 error

* Started adding scrutinizer coverage

* Added UnitTestCase class

* Added badges to README

* Changed app logo name

The icon is showing up in the app list now.

* Added screenshot replacement to Makefile

* Added oC branded screenshots

* Added test skeletons

* Added further factories

* Added all basic crud unit tests

* Fixed @Depends in unit tests

* Small doc block update

* First try to clean up a bit

* Updated info.xml

* Corrected encoding of info.xml

* Added type casting to model classes

* use p() again, remove html tags from title and desc

* remove old ocsid

* Optimized imports + type hints

* Restored missing files

* Added missing logo

* Added 0.8.1 changelog

* Cumulative css fixes

* remove css

* Added some more type hints

* updated sidebar

* some update

* add avatar to new comment

A quick fix.

* Fix appearance first comment

And some design optimation, when there are no comments

* changed comment form

* Adding Information badges to sidebar

* Added sass compiler

* uncompressed css

* Update CSS

* some optimations

* fix broken vote.css

* Updates on comments

* fix margin

* Some tidy and enhancement

* Added border to comment box

* Removed occ signing

See: nextcloud/appstore#530 (comment)

* Missed one

* added border to expiry info

* Temporary fix for NC13 beta 1

* CSS work

* Fix Breadcrump on OC10 - NC12

* Post delivery of corresponding CSS

* Fixed Text box cursor style for OC10 and NC11-NC12

* Limited some test data to 256 chars

* Fixed Avatar adding on comments

* Centering badge text

* cursor on textbox

Obviously the commit was missing.

* fix

* replace row class with table-row class

* Updated screenshots

* Quick fix for Poll description textarea

* Update .gitignore

* Updated version and changelog

* Scrutinizer hints

* Design optimations

* late delivery

* housekeeping

* CSS fix in new comment

* Update to preserve line break in description

* Change on calculating expiry time stamp

* fix-oc-avatars

* Replace serveral double quotes

* Replace double quotes

* renamed vars

* little changes

* Changes on request

* cleaning

* Replaced ? by ⌘

* added -webkit-mask

* Fixed PageController returning displayName as userId

* Fixed time string not apperaring after posting comment

* Give table width 100%

* time information for new comment
  • Loading branch information
dartcafe committed Dec 19, 2017
1 parent 33dd363 commit c64a016
Show file tree
Hide file tree
Showing 99 changed files with 4,001 additions and 2,478 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Expand Up @@ -19,7 +19,7 @@ indent_size = 4
trim_trailing_whitespace = true
max_line_length = 80

# 2 space indentation for .travis.yml
[.travis.yml]
# 2 space indentation for .yml files
[.*.yml]
indent_style = space
indent_size = 2
11 changes: 10 additions & 1 deletion .gitignore
@@ -1,3 +1,12 @@
/.project
.sass-cache/
.project/
.idea/
build/
css/*.map
nbproject/
vendor/
*.cmd
*.lock
*.iml
.DS_Store
Thumbs.db
20 changes: 12 additions & 8 deletions .scrutinizer.yml
@@ -1,13 +1,17 @@
filter:
excluded_paths:
- 'l10n/*'
- 'js/vendor/*'
excluded_paths:
- 'l10n/*'
- 'js/vendor/*'

imports:
- javascript
- php
- javascript
- php

tools:
external_code_coverage:
timeout: 1000

build:
tests:
override:
- jshint-run --config js/.jshintrc
tests:
override:
- jshint-run --config js/.jshintrc
6 changes: 3 additions & 3 deletions .scss-lint.yml
@@ -1,4 +1,4 @@
build:
tests:
override:
- scss-lint-run /css
tests:
override:
- scss-lint-run /css
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -51,5 +51,10 @@ script:
# Execute tests
- make test

after_success:
# Generate Code Coverage
- wget https://scrutinizer-ci.com/ocular.phar
- php ocular.phar code-coverage:upload --format=php-clover clover.xml

after_failure:
- cat ../../data/${CLOUD}.log
18 changes: 15 additions & 3 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,21 @@

All notable changes to this project will be documented in this file.

## [0.8.1] - 2017-12-xx

### Added
- Unit tests
- App favicon
- More languages

### Changed
- New vote page design (responsive)
- New comment design
- A lot of clean up

### Fixed
- Linebreak bug

## [0.8.0] - 2017-10-13

### Changed
Expand Down Expand Up @@ -58,7 +73,6 @@ All notable changes to this project will be documented in this file.
- 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
Expand All @@ -78,11 +92,9 @@ All notable changes to this project will be documented in this file.
- Edit polls

### Changed

- New minimal version set to 8.1

### Fixed

- Replaced deprecated methods
- Switched from raw php to controller
- Fixed several bugs
Expand Down
13 changes: 3 additions & 10 deletions Makefile
Expand Up @@ -79,11 +79,6 @@ appstore:
--exclude="l10n/no-php" \
./ $(build_source_directory)/$(app_name)

@if [ -f $(nc_cert_directory)/$(app_name).key ]; then \
echo "Creating integrity file..."; \
php ../../occ integrity:sign-app --privateKey="$(nc_cert_directory)/$(app_name).key" --certificate="$(nc_cert_directory)/$(app_name).crt" --path "$(build_source_directory)/$(app_name)"; \
fi

tar cvzf $(appstore_package_name).tar.gz --directory="$(build_source_directory)" $(app_name)

@if [ -f $(nc_cert_directory)/$(app_name).key ]; then \
Expand Down Expand Up @@ -129,10 +124,8 @@ else
--exclude="css/*.scss" \
./ $(build_source_directory)/$(app_name)

@if [ -f $(oc_cert_directory)/$(app_name).key ]; then \
echo "Creating integrity file..."; \
php ../../occ integrity:sign-app --privateKey="$(oc_cert_directory)/$(app_name).key" --certificate="$(oc_cert_directory)/$(app_name).crt" --path "$(build_source_directory)/$(app_name)"; \
fi
# We need to replace Nc screenshot urls with the oC ones
sed -i -E "s~(<screenshot>)([^<]*).(png|jpg|jpeg)(</screenshot>)~\1\2-oc.\3\4~" $(build_source_directory)/$(app_name)/appinfo/info.xml

tar cvzf $(marketplace_package_name).tar.gz --directory="$(build_source_directory)" $(app_name)

Expand All @@ -144,5 +137,5 @@ endif

.PHONY: test
test: composer
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml
$(CURDIR)/vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c phpunit.xml
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
9 changes: 7 additions & 2 deletions README.md
@@ -1,6 +1,9 @@
# Polls

[![Build Status](https://travis-ci.org/nextcloud/polls.svg?branch=master)](https://travis-ci.org/nextcloud/polls)
[![Build Status](https://img.shields.io/travis/nextcloud/polls.svg?style=flat-square)](https://travis-ci.org/nextcloud/polls)
[![Scrutinizer](https://img.shields.io/scrutinizer/g/nextcloud/polls.svg?style=flat-square)](https://scrutinizer-ci.com/g/nextcloud/polls)
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/nextcloud/polls.svg?style=flat-square)](https://scrutinizer-ci.com/g/nextcloud/polls)
[![Software License](https://img.shields.io/badge/license-AGPL-brightgreen.svg?style=flat-square)](LICENSE)

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.
Expand All @@ -16,8 +19,10 @@ It is a rework of the already existing [polls app](https://github.com/raduvatav/

### Screenshots
![Overview](https://github.com/nextcloud/polls/blob/master/screenshots/overview.png)

![Vote](https://github.com/nextcloud/polls/blob/master/screenshots/vote.png)
![New poll](https://github.com/nextcloud/polls/blob/master/screenshots/new-poll.png)

![New poll](https://github.com/nextcloud/polls/blob/master/screenshots/edit-poll.png)

## Installation / Update
This app is supposed to work on Nextcloud version 11+ or ownCloud version 8+.
Expand Down
11 changes: 7 additions & 4 deletions appinfo/info.xml
Expand Up @@ -5,20 +5,23 @@
<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>0.8.0</version>
<version>0.8.1</version>
<licence>agpl</licence>
<author>Vinzenz Rosenkranz</author>
<author>René Gieling</author>
<author>Kai Schröer</author>
<documentation>
<admin>https://github.com/nextcloud/polls/blob/master/README.md</admin>
</documentation>
<category>tools</category>
<website>https://github.com/nextcloud/polls</website>
<bugs>https://github.com/nextcloud/polls/issues</bugs>
<repository type="git">https://github.com/nextcloud/polls.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/new-poll.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/overview.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/vote.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/polls/master/screenshots/edit-poll.png</screenshot>
<dependencies>
<owncloud min-version="8.2" max-version="10.0"/>
<owncloud min-version="8.2" max-version="10.0" />
<nextcloud min-version="11" max-version="13" />
</dependencies>
<ocsid>174671</ocsid>
</info>
14 changes: 11 additions & 3 deletions composer.json
@@ -1,14 +1,22 @@
{
"name": "polls",
"description": "This is a poll app, similar to doodle or dudle with the possibility for restrict access (only members, certain groups/users, hidden and public).",
"type": "project",
"license": "AGPL",
"license": "AGPLv3",
"authors": [
{
"name": "Vinzenz Rosenkranz"
},
{
"name": "Kai Schröer"
},
{
"name": "René Gieling"
}
],
"require-dev": {
"phpunit/phpunit": "^5.4"
"christophwurst/nextcloud": "^12.0",
"phpunit/phpunit": "^5.4",
"league/factory-muffin": "^3.0",
"league/factory-muffin-faker": "^2.0"
}
}
124 changes: 64 additions & 60 deletions css/createpoll.css
@@ -1,74 +1,78 @@
.user-group-list {
display:none;
border:1px solid #ddd;
margin:15px;
padding:5px;
border-radius:3px;
max-height:150px;
overflow-y:auto
}
display: none;
border: 1px solid #DDD;
margin: 15px;
padding: 5px;
border-radius: 3px;
max-height: 150px;
overflow-y: auto; }

#sec_name {
display:none
}
display: none; }

.cl_access_item {
padding:5px;
background-color:white;
color:#333;
cursor:pointer
}
padding: 5px;
background-color: white;
color: #333;
cursor: pointer; }

.cl_access_item:hover {
background-color:#eee
}
background-color: #EEE; }

.cl_access_item.selected {
background-color:#409ae7;
color:#fff
}
background-color: #409AE7;
color: #FFF; }

.cl_access_item.selected:hover {
background-color:#ff6f6f;
color:#fff;
text-decoration:line-through
}
background-color: #FF6F6F;
color: #FFF;
text-decoration: line-through; }

textarea {
min-height:66px
}
min-height: 66px; }

.choices {
margin-top:10px
}
margin-top: 10px; }

.choices td {
min-width:30px
}
min-width: 30px; }

table td {
text-align:center
}
.text-row,.date-row {
font-weight:bold;
padding:2px 5px;
background-color:#337ab7;
color:#fff;
text-align:left
}
.text-row:hover,.date-row:hover {
background-color:#ff6f6f;
text-decoration:line-through
}
text-align: center; }

.text-row, .date-row {
font-weight: bold;
padding: 2px 5px;
background-color: #337AB7;
color: #FFF;
text-align: left; }

.text-row:hover, .date-row:hover {
background-color: #ff6f6f;
text-decoration: line-through; }

#selected-dates-table tr:first-child td {
font-weight:bold;
padding:2px 5px;
background-color:#337ab7;
color:#fff
}
font-weight: bold;
padding: 2px 5px;
background-color: #337AB7;
color: #FFF; }

table .icon-close {
cursor:pointer;
background-color:#ffede9;
padding:0 5px;
background-image:url('../img/no-vote.svg')
}
cursor: pointer;
background-color: #ffede9;
/*red*/
padding: 0 5px;
background-image: url("../img/no-vote.svg"); }

table .icon-checkmark {
cursor:pointer;
background-color:#ebf5d6;
padding:0 5px;
background-image:url('../img/yes-vote.svg')
}
cursor: pointer;
background-color: #ebf5d6;
/*green*/
padding: 0 5px;
background-image: url("../img/yes-vote.svg"); }

#expiration {
max-width:200px
}
max-width: 200px; }

#pollDesc {
width: 100%; }
4 changes: 4 additions & 0 deletions css/createpoll.scss
Expand Up @@ -88,3 +88,7 @@ table .icon-checkmark {
#expiration {
max-width: 200px;
}

#pollDesc {
width: 100%;
}

0 comments on commit c64a016

Please sign in to comment.