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

Merge 2.4 into master #3984

Merged
merged 144 commits into from May 29, 2019
Merged

Merge 2.4 into master #3984

merged 144 commits into from May 29, 2019

Conversation

j0k3r
Copy link
Member

@j0k3r j0k3r commented May 29, 2019

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:

j0k3r and others added 30 commits July 3, 2018 13:55
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
- 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()`
nicofrand and others added 23 commits May 21, 2019 20:38
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
Preview picture: use the 1st pic retrieved if no og:image set
Use httplug and graby 2.0
@j0k3r j0k3r added this to the 2.4.0 milestone May 29, 2019
@j0k3r j0k3r requested review from Kdecherf and tcitworld May 29, 2019 08:36
Copy link
Member

@tcitworld tcitworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💪

@j0k3r j0k3r merged commit 73ec68b into master May 29, 2019
@j0k3r j0k3r deleted the 2.4 branch May 29, 2019 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet