mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 11:01:04 +00:00
Merge remote-tracking branch 'origin/master' into 2.3
This commit is contained in:
Jeremy Benoist
commit
54c2d164a3
13 changed files with 37 additions and 11 deletions
|
|
@ -47,7 +47,7 @@ make release master /tmp wllbg-release prod
|
|||
|
||||
- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
|
||||
- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
|
||||
- Update the URL shortener (used on `wllbg.org` to generate links like `http://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
|
||||
- Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
|
||||
- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
|
||||
- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
|
||||
- Update wallabag.org website (downloads, releases and new blog post)
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Lade das letzte Release von wallabag herunter:
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
|
||||
Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://static.wallabag.org/releases/>`_.
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ Download the last release of wallabag:
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
|
||||
You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
|
||||
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ Téléchargez la dernière version de wallabag :
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
|
||||
Vous trouverez `le hash md5 du dernier package sur notre site <https://static.wallabag.org/releases/>`_.
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ Eseguite questo comando per scaricare ed estrarre il pacchetto piú aggiornato:
|
|||
|
||||
.. code-block:: bash
|
||||
|
||||
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
|
||||
Troverete il `hash md5 del pacchetto piú aggiornato sul nostro sito <https://static.wallabag.org/releases/>`_.
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ Scaricate l'ultima versione di wallabag:
|
|||
|
||||
. code-block:: bash
|
||||
|
||||
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
|
||||
|
||||
Troverete il `hash md5 dell'ultima versione del pacchetto sul nostro sito <https://static.wallabag.org/releases/>`_.
|
||||
|
||||
|
|
|
|||
|
|
@ -95,12 +95,13 @@ class EntryRestController extends WallabagRestController
|
|||
$tags = $request->query->get('tags', '');
|
||||
$since = $request->query->get('since', 0);
|
||||
|
||||
/** @var \Pagerfanta\Pagerfanta $pager */
|
||||
$pager = $this->getDoctrine()
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags);
|
||||
|
||||
$pager->setCurrentPage($page);
|
||||
$pager->setMaxPerPage($perPage);
|
||||
$pager->setCurrentPage($page);
|
||||
|
||||
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
|
||||
$paginatedCollection = $pagerfantaFactory->createRepresentation(
|
||||
|
|
|
|||
|
|
@ -16,7 +16,11 @@ class ClientType extends AbstractType
|
|||
{
|
||||
$builder
|
||||
->add('name', TextType::class, ['label' => 'developer.client.form.name_label'])
|
||||
->add('redirect_uris', UrlType::class, ['required' => false, 'label' => 'developer.client.form.redirect_uris_label'])
|
||||
->add('redirect_uris', UrlType::class, [
|
||||
'required' => false,
|
||||
'label' => 'developer.client.form.redirect_uris_label',
|
||||
'property_path' => 'redirectUris',
|
||||
])
|
||||
->add('save', SubmitType::class, ['label' => 'developer.client.form.save_label'])
|
||||
;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,11 @@ class ConfigType extends AbstractType
|
|||
])
|
||||
->add('items_per_page', null, [
|
||||
'label' => 'config.form_settings.items_per_page_label',
|
||||
'property_path' => 'itemsPerPage',
|
||||
])
|
||||
->add('reading_speed', ChoiceType::class, [
|
||||
'label' => 'config.form_settings.reading_speed.label',
|
||||
'property_path' => 'readingSpeed',
|
||||
'choices' => [
|
||||
'config.form_settings.reading_speed.100_word' => '0.5',
|
||||
'config.form_settings.reading_speed.200_word' => '1',
|
||||
|
|
@ -51,6 +53,7 @@ class ConfigType extends AbstractType
|
|||
])
|
||||
->add('action_mark_as_read', ChoiceType::class, [
|
||||
'label' => 'config.form_settings.action_mark_as_read.label',
|
||||
'property_path' => 'actionMarkAsRead',
|
||||
'choices' => [
|
||||
'config.form_settings.action_mark_as_read.redirect_homepage' => Config::REDIRECT_TO_HOMEPAGE,
|
||||
'config.form_settings.action_mark_as_read.redirect_current_page' => Config::REDIRECT_TO_CURRENT_PAGE,
|
||||
|
|
@ -61,6 +64,7 @@ class ConfigType extends AbstractType
|
|||
'label' => 'config.form_settings.language_label',
|
||||
])
|
||||
->add('pocket_consumer_key', null, [
|
||||
'property_path' => 'pocketConsumerKey',
|
||||
'label' => 'config.form_settings.pocket_consumer_key_label',
|
||||
])
|
||||
->add('save', SubmitType::class, [
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ class RssType extends AbstractType
|
|||
$builder
|
||||
->add('rss_limit', null, [
|
||||
'label' => 'config.form_rss.rss_limit',
|
||||
'property_path' => 'rssLimit',
|
||||
])
|
||||
->add('save', SubmitType::class, [
|
||||
'label' => 'config.form.save',
|
||||
|
|
|
|||
|
|
@ -106,8 +106,8 @@
|
|||
<tr><td>hoa/zformat</td><td>BSD-3-Clause</td></tr>
|
||||
<tr><td>htmlawed/htmlawed</td><td>GPL-2.0+ or LGPL-3.0</td></tr>
|
||||
<tr><td>incenteev/composer-parameter-handler</td><td>MIT</td></tr>
|
||||
<tr><td>j0k3r/graby</td><td>AGPL-3.0</td></tr>
|
||||
<tr><td>j0k3r/graby-site-config</td><td>AGPL-3.0</td></tr>
|
||||
<tr><td>j0k3r/graby</td><td>MIT</td></tr>
|
||||
<tr><td>j0k3r/graby-site-config</td><td>Public domain</td></tr>
|
||||
<tr><td>j0k3r/php-readability</td><td>Apache-2.0</td></tr>
|
||||
<tr><td>j0k3r/safecurl</td><td>MIT</td></tr>
|
||||
<tr><td>jdorn/sql-formatter</td><td>MIT</td></tr>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<div class="card-content">
|
||||
|
||||
{% if error %}
|
||||
<script>Materialize.toast('{{ error.message }}', 4000)</script>
|
||||
<script>Materialize.toast('{{ error.messageKey|trans(error.messageData, 'security') }}', 4000)</script>
|
||||
{% endif %}
|
||||
|
||||
{% for flashMessage in app.session.flashbag.get('notice') %}
|
||||
|
|
|
|||
|
|
@ -156,6 +156,22 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
|||
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
|
||||
}
|
||||
|
||||
public function testGetEntriesOnPageTwo()
|
||||
{
|
||||
$this->client->request('GET', '/api/entries', [
|
||||
'page' => 2,
|
||||
'perPage' => 2,
|
||||
]);
|
||||
|
||||
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
|
||||
|
||||
$content = json_decode($this->client->getResponse()->getContent(), true);
|
||||
|
||||
$this->assertGreaterThanOrEqual(0, $content['total']);
|
||||
$this->assertEquals(2, $content['page']);
|
||||
$this->assertEquals(2, $content['limit']);
|
||||
}
|
||||
|
||||
public function testGetStarredEntries()
|
||||
{
|
||||
$this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']);
|
||||
|
|
|
|||
Loading…
Reference in a new issue