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.

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

wallabag 2.1 #1999

Merged
merged 282 commits into from
Oct 3, 2016
Merged

wallabag 2.1 #1999

merged 282 commits into from
Oct 3, 2016

Conversation

nicosomb
Copy link
Member

@nicosomb nicosomb commented Apr 29, 2016

Added

Changed

Fixed

Removed

j0k3r and others added 2 commits August 22, 2016 20:16
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
#2201
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
#2171
j0k3r and others added 12 commits August 22, 2016 23:03
Tests not included
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
j0k3r and others added 28 commits October 2, 2016 01:43
+ remove extra sentence
Add ability to edit a tagging rule
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
To avoid some bad things to happen…
We forgot to pass them to the factory
Fix parameters in API _links
Just some little mistakes, good work so far :)
for 2.1, translate all strings to German, which haven't been translated yet
@j0k3r j0k3r merged commit 8c3c69f into master Oct 3, 2016
@j0k3r j0k3r deleted the 2.1 branch October 3, 2016 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants