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
Merge 2.4 into master #3984
Merged
Merge 2.4 into master #3984
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Entry: add archived_at property and updateArchived method
The current tag is removed from all the current logged user entries. Then the new one is created and attached.
This will help handling the CSRF protection token and use symfony HTML generation layer. Also a FormView instance is generated for each tag because we need to render a form for each tag and FormView are not reusable.
* Add a form on each tag to handle rename action. * Add JavaScript to handle action on the corresponding page inside the global index.js file. * Add support for the 2 active themes : material / baggy The form solution is cleaner than an Ajax one because it let the browser validate input data and make the POST easier without the need to handle JSON response.
Add new translations in each language file.
Also add a `.hidden` class in the baggy theme to have consistency with material.
Thanks to the BC compatibility, almost nothing have to be changed. All changes are related to new bundle version of: - SensioFrameworkExtraBundle - DoctrineFixturesBundle
Jump to Symfony 3.4
Add secure email
- Do not override locale if user has choosen a locale from the login screen. - Add some tests about locale url
Added possibility to change locale from login/register pages
Allow to rename tags from the web interface.
# Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js
People should really follow semver and provide UPGRADE file when they provide a library ...
To fix deprecated message regarding `each()`
Force PHP version in Dockerfile
Simplify the logic from #3158 by hashing all the urls from the request, and only doing a search by hash. This allows to get performance benefits from the new indexed hash column even when using older clients that do not hash the URL in the request. Fixes: #3158, #3919 Signed-off-by: Olivier Mehani <shtrom@ssji.net>
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
Also fix a phpdoc block
Fix Instapaper import date order
Preview picture: use the 1st pic retrieved if no og:image set
Use httplug and graby 2.0
Always hash exists url
tcitworld
approved these changes
May 29, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💪
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So the next version of wallabag might be the 2.4.0. This doesn't mean we are going to release the 2.4.0 in next days. There are still some work to be done 🙂
I created a branch called
2.3.x
just in case we need to create a new version before the 2.4.0 OR if we want to keep some kind of support to the 2.3.* branch.Here is a list of all PRs included: