Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release v1.3.0 #32

Merged
merged 14 commits into from
Oct 27, 2016
Merged

Release v1.3.0 #32

merged 14 commits into from
Oct 27, 2016

Conversation

blackus3r
Copy link
Owner

@blackus3r blackus3r commented Oct 25, 2016 •
edited
Loading

Things to do:

  • udpate readme.md
  • update readme.txt
  • update changelog
  • update german translation
  • wait until everything is merged for v1.3.0
  • update screenshots

blackus3r and others added 2 commits October 23, 2016 20:19
@blackus3r
Merge branch 'master' into swimlane/1.3.0
c378395
Implement option page (#26)
36841e9 
* Implemented Support to enable/disable control box.
* Implemented button and functionality to reset whole worktime of each post.
@blackus3r blackus3r added this to the 1.3.0 milestone Oct 25, 2016
@blackus3r blackus3r self-assigned this Oct 25, 2016
zachwills and others added 12 commits October 25, 2016 17:19
@zachwills
Add inactivity timeout option and use description class for option de…
da75864 
…scriptions. (#37)

* Add setting for inactivity timeout.
* Mark pwl as a global.
* Use description paragraphs instead of title attribute.
Improved readme.md, readme.txt, license and added screenshots 1.3.0 (#36
e2d5d27 
)

* Improved readme.md
* Fixed GPL License in files.
* Added changelog and license. Modified readme.txt too
* Changed screenshots to local repository
@blackus3r
Merge branch 'master' into swimlane/1.3.0
51ecd64 
# Conflicts:
#	post-worktime-logger.php
Removed unused code
096b88b
add statistics page (#40)
4d85c7d 
* add statistics page
* add new resource: minified Chart.js

Initial version of this feature was done by @selamanse. Thank you.
@blackus3r
Revert "Removed unused code"
e8de7f7 
This reverts commit 096b88b.
@blackus3r
Fixed some strings and the text domain for new strings.
67d4ed7
@blackus3r
Updated german language.
d541ac6
@blackus3r
Fixed some translations.
a5b834b
@blackus3r
Added screenshots.
069ac1e
Updated version information for 1.3.0
d15f188
Added changelog also to readme.md
8eea509
@blackus3r blackus3r merged commit b87bd7a into master Oct 27, 2016
@blackus3r blackus3r deleted the swimlane/1.3.0 branch October 27, 2016 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@blackus3r blackus3r

Labels
None yet
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
2 participants
@blackus3r @zachwills