]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoMerge pull request #1774 from wallabag/v2-key-translation
Nicolas Lœuillet [Mon, 21 Mar 2016 11:47:57 +0000 (12:47 +0100)] 
Merge pull request #1774 from wallabag/v2-key-translation

Switch to keys in translated files

8 years agoUpdate docs about translation 1774/head
Jeremy Benoist [Mon, 21 Mar 2016 09:08:56 +0000 (10:08 +0100)] 
Update docs about translation

8 years agoAdd reading time translation
Jeremy Benoist [Sun, 20 Mar 2016 21:09:00 +0000 (22:09 +0100)] 
Add reading time translation

8 years agoPut more validations on travis
Jeremy Benoist [Sun, 20 Mar 2016 20:10:17 +0000 (21:10 +0100)] 
Put more validations on travis

Run php-cs-fixer to avoid CS on commits
Add a check on translation message using the built-in yaml validator. It'll avoid typo in translation yaml files.

8 years agoConvert more languages
Jeremy Benoist [Fri, 18 Mar 2016 22:40:11 +0000 (23:40 +0100)] 
Convert more languages

8 years agoTranslation typos
Jeremy Benoist [Wed, 16 Mar 2016 23:05:25 +0000 (00:05 +0100)] 
Translation typos

Fix #1793

8 years agoAdd missing developer page
Jeremy Benoist [Wed, 16 Mar 2016 22:56:42 +0000 (23:56 +0100)] 
Add missing developer page

8 years agoConvert french translation
Jeremy Benoist [Wed, 16 Mar 2016 22:16:03 +0000 (23:16 +0100)] 
Convert french translation

8 years agoCS
Jeremy Benoist [Fri, 11 Mar 2016 13:55:02 +0000 (14:55 +0100)] 
CS

8 years agoAdd flashes messages
Jeremy Benoist [Fri, 11 Mar 2016 13:48:46 +0000 (14:48 +0100)] 
Add flashes messages

8 years agoImprove test failure readability
Jeremy Benoist [Fri, 11 Mar 2016 08:42:08 +0000 (09:42 +0100)] 
Improve test failure readability

If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text.
So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read.

8 years agoConvert english translation file
Jeremy Benoist [Wed, 9 Mar 2016 07:59:08 +0000 (08:59 +0100)] 
Convert english translation file

- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`

8 years agoDisable translation in test
Jeremy Benoist [Wed, 9 Mar 2016 07:55:30 +0000 (08:55 +0100)] 
Disable translation in test

We don't want to test translation in test

8 years agoRevert "Transferring API Description file from Apiary.io"
Nicolas Lœuillet [Fri, 18 Mar 2016 15:28:45 +0000 (16:28 +0100)] 
Revert "Transferring API Description file from Apiary.io"

This reverts commit 169d60abc7e0ee191bfb66ecb1fbbac14ab88095.

8 years agoTransferring API Description file from Apiary.io
Nicolas Lœuillet [Fri, 18 Mar 2016 15:24:05 +0000 (16:24 +0100)] 
Transferring API Description file from Apiary.io

8 years agoMerge pull request #1767 from wallabag/v2-setting-for-reading-time
Jeremy Benoist [Fri, 18 Mar 2016 13:30:38 +0000 (14:30 +0100)] 
Merge pull request #1767 from wallabag/v2-setting-for-reading-time

Setting for reading time

8 years agoImproved tests 1767/head
Nicolas Lœuillet [Fri, 18 Mar 2016 12:12:09 +0000 (13:12 +0100)] 
Improved tests

8 years agoMerge pull request #1799 from wallabag/v2-fix-tabs-display-material
Nicolas Lœuillet [Fri, 18 Mar 2016 11:52:40 +0000 (12:52 +0100)] 
Merge pull request #1799 from wallabag/v2-fix-tabs-display-material

fix tabs display on mobile view

8 years agoFix documentation and add help message in Baggy
Nicolas Lœuillet [Fri, 18 Mar 2016 11:36:52 +0000 (12:36 +0100)] 
Fix documentation and add help message in Baggy

8 years agoMerge pull request #1791 from wallabag/v2-fix-api-entry-properties
Jeremy Benoist [Wed, 16 Mar 2016 22:23:42 +0000 (23:23 +0100)] 
Merge pull request #1791 from wallabag/v2-fix-api-entry-properties

fix api properties and typo

8 years agoadd check 1791/head
Thomas Citharel [Wed, 16 Mar 2016 21:47:12 +0000 (22:47 +0100)] 
add check

8 years agofix updating entry status through API
Thomas Citharel [Wed, 16 Mar 2016 21:43:32 +0000 (22:43 +0100)] 
fix updating entry status through API

8 years agocheck if archive/star parameters without quotes work
Thomas Citharel [Wed, 16 Mar 2016 20:38:50 +0000 (21:38 +0100)] 
check if archive/star parameters without quotes work

8 years agouse integers for archived/starred status
Thomas Citharel [Wed, 16 Mar 2016 19:41:29 +0000 (20:41 +0100)] 
use integers for archived/starred status

8 years agofix api properties and typo
Thomas Citharel [Tue, 15 Mar 2016 17:50:13 +0000 (18:50 +0100)] 
fix api properties and typo

8 years agofix tabs display on mobile view 1799/head
Thomas Citharel [Wed, 16 Mar 2016 21:15:01 +0000 (22:15 +0100)] 
fix tabs display on mobile view

8 years agoMerge pull request #1797 from wallabag/v2-fix-adding-entry-API
Jeremy Benoist [Wed, 16 Mar 2016 20:40:36 +0000 (21:40 +0100)] 
Merge pull request #1797 from wallabag/v2-fix-adding-entry-API

Don't add entry through API if it already exists

8 years agoDon't add entry through API if it already exists 1797/head
Thomas Citharel [Wed, 16 Mar 2016 20:07:01 +0000 (21:07 +0100)] 
Don't add entry through API if it already exists

8 years agoMerge pull request #1792 from wallabag/v2-add-tests-for-api-user
Jeremy Benoist [Wed, 16 Mar 2016 09:45:09 +0000 (10:45 +0100)] 
Merge pull request #1792 from wallabag/v2-add-tests-for-api-user

add tests on user in API responses

8 years agoadd tests on user in API responses 1792/head
Thomas Citharel [Tue, 15 Mar 2016 18:31:31 +0000 (19:31 +0100)] 
add tests on user in API responses

8 years agoReplace slider with select
Nicolas Lœuillet [Mon, 14 Mar 2016 12:49:47 +0000 (13:49 +0100)] 
Replace slider with select

8 years agoTranslation and documentation
Nicolas Lœuillet [Thu, 10 Mar 2016 12:18:59 +0000 (13:18 +0100)] 
Translation and documentation

8 years agoFix default value and add baggy implementation
Nicolas Lœuillet [Thu, 10 Mar 2016 12:02:36 +0000 (13:02 +0100)] 
Fix default value and add baggy implementation

8 years agoFixed fixtures for config
Nicolas Lœuillet [Tue, 8 Mar 2016 15:48:30 +0000 (16:48 +0100)] 
Fixed fixtures for config

8 years agoAdded setting to have a personal reading time
Nicolas Lœuillet [Tue, 8 Mar 2016 15:44:25 +0000 (16:44 +0100)] 
Added setting to have a personal reading time

8 years agoMerge pull request #1786 from wallabag/v2-restrict-user-infos
Nicolas Lœuillet [Mon, 14 Mar 2016 05:15:46 +0000 (06:15 +0100)] 
Merge pull request #1786 from wallabag/v2-restrict-user-infos

API shows just what needed for user

8 years agoMerge pull request #1784 from wallabag/v2-add-refresh-token
Nicolas Lœuillet [Mon, 14 Mar 2016 05:14:22 +0000 (06:14 +0100)] 
Merge pull request #1784 from wallabag/v2-add-refresh-token

add refresh-token grant-type

8 years agoAPI shows just what needed for user 1786/head
Thomas Citharel [Sun, 13 Mar 2016 19:17:52 +0000 (20:17 +0100)] 
API shows just what needed for user

8 years agoadd refresh-token grant-type 1784/head
Thomas Citharel [Sun, 13 Mar 2016 16:53:56 +0000 (17:53 +0100)] 
add refresh-token grant-type

8 years agoMerge pull request #1775 from wallabag/v2-few-fixes
Nicolas Lœuillet [Sat, 12 Mar 2016 10:10:21 +0000 (11:10 +0100)] 
Merge pull request #1775 from wallabag/v2-few-fixes

Some fixes

8 years agoFix hazardous bug with Postgres 1775/head
Jeremy Benoist [Sat, 12 Mar 2016 09:45:14 +0000 (10:45 +0100)] 
Fix hazardous bug with Postgres

Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used

8 years agoMerge pull request #1776 from wallabag/v2-doc-clarify-php7
Nicolas Lœuillet [Fri, 11 Mar 2016 19:39:48 +0000 (20:39 +0100)] 
Merge pull request #1776 from wallabag/v2-doc-clarify-php7

clarify that wllbg is compatible php 7

8 years agoclarify that wllbg is compatible php 7 1776/head
Thomas Citharel [Fri, 11 Mar 2016 19:14:14 +0000 (20:14 +0100)] 
clarify that wllbg is compatible php 7

8 years agoImprove tests
Jeremy Benoist [Fri, 11 Mar 2016 16:56:41 +0000 (17:56 +0100)] 
Improve tests

- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges

8 years agoUse --prefer-dist to improve CI perf
Jeremy Benoist [Fri, 11 Mar 2016 13:55:33 +0000 (14:55 +0100)] 
Use --prefer-dist to improve CI perf

https://twitter.com/seldaek/status/708236348281495552

8 years agoMerge pull request #1763 from wallabag/v2-prepare-beta2
Jeremy Benoist [Fri, 11 Mar 2016 12:43:57 +0000 (13:43 +0100)] 
Merge pull request #1763 from wallabag/v2-prepare-beta2

Prepare files for 2.0.0-beta.2

8 years agogit clone with prefer-dist option 1763/head
Nicolas Lœuillet [Thu, 10 Mar 2016 12:04:56 +0000 (13:04 +0100)] 
git clone with prefer-dist option

8 years agoFinally back to composer create-project but with --keep-vcs option
Nicolas Lœuillet [Thu, 10 Mar 2016 11:41:45 +0000 (12:41 +0100)] 
Finally back to composer create-project but with --keep-vcs option

8 years agoAdd -o option in composer install command
Nicolas Lœuillet [Tue, 8 Mar 2016 11:08:41 +0000 (12:08 +0100)] 
Add -o option in composer install command

8 years agoFrench documentation for new installation
Nicolas Lœuillet [Tue, 8 Mar 2016 10:42:11 +0000 (11:42 +0100)] 
French documentation for new installation

8 years agoPrepare files for 2.0.0-beta.2
Nicolas Lœuillet [Tue, 8 Mar 2016 10:40:37 +0000 (11:40 +0100)] 
Prepare files for 2.0.0-beta.2

8 years agoMerge pull request #1771 from wallabag/docker-timezone
Nicolas Lœuillet [Wed, 9 Mar 2016 09:42:15 +0000 (10:42 +0100)] 
Merge pull request #1771 from wallabag/docker-timezone

Docker timezone

8 years agoAdd comment about timezone definition 1771/head
djay [Thu, 3 Mar 2016 18:21:37 +0000 (19:21 +0100)] 
Add comment about timezone definition

8 years agoAdd the timezone as an argument in the docker-compose.
djay [Wed, 2 Mar 2016 12:31:53 +0000 (13:31 +0100)] 
Add the timezone as an argument in the docker-compose.

For that, need to use v2 of docker-compose (with version >= 1.6.0)

8 years agoAdd the timezone for PHP docker container
djay [Thu, 25 Feb 2016 20:56:33 +0000 (21:56 +0100)] 
Add the timezone for PHP docker container

8 years agoMerge pull request #1766 from wallabag/v2-add-wallabag-in-title
Jeremy Benoist [Tue, 8 Mar 2016 14:49:13 +0000 (15:49 +0100)] 
Merge pull request #1766 from wallabag/v2-add-wallabag-in-title

Fix #1756: Added 'wallabag' in page title

8 years agoAdded 'wallabag' in page title 1766/head
Nicolas Lœuillet [Tue, 8 Mar 2016 14:22:35 +0000 (15:22 +0100)] 
Added 'wallabag' in page title

8 years agoMerge pull request #1762 from wallabag/v2-fix-quickstart-links
Jeremy Benoist [Tue, 8 Mar 2016 11:00:59 +0000 (12:00 +0100)] 
Merge pull request #1762 from wallabag/v2-fix-quickstart-links

Change documentation links in quickstart

8 years agoChange documentation links in quickstart 1762/head
Nicolas Lœuillet [Tue, 8 Mar 2016 10:21:40 +0000 (11:21 +0100)] 
Change documentation links in quickstart

8 years agoMerge pull request #1761 from wallabag/v2-API-version
Nicolas Lœuillet [Tue, 8 Mar 2016 09:09:57 +0000 (10:09 +0100)] 
Merge pull request #1761 from wallabag/v2-API-version

V2 api version

8 years agoMerge pull request #1675 from wallabag/v2-create-api-client
Nicolas Lœuillet [Tue, 8 Mar 2016 09:09:39 +0000 (10:09 +0100)] 
Merge pull request #1675 from wallabag/v2-create-api-client

Ability to create new client for the API

8 years agotypos & cs 1761/head
Thomas Citharel [Tue, 8 Mar 2016 08:22:25 +0000 (09:22 +0100)] 
typos & cs

8 years agowrite test for version
Vincent [Mon, 7 Mar 2016 14:16:27 +0000 (15:16 +0100)] 
write test for version

8 years agoAdd version in API
Vincent [Mon, 7 Mar 2016 14:00:03 +0000 (15:00 +0100)] 
Add version in API

8 years agoFix translations mistake 1675/head
Jeremy Benoist [Mon, 7 Mar 2016 10:05:14 +0000 (11:05 +0100)] 
Fix translations mistake

In Material template, move the developer link in the left menu (like in baggy)

8 years agoTranslate "how to" page
Jeremy Benoist [Mon, 7 Mar 2016 08:20:20 +0000 (09:20 +0100)] 
Translate "how to" page

8 years agoUse external js & css
Jeremy Benoist [Mon, 7 Mar 2016 07:58:08 +0000 (08:58 +0100)] 
Use external js & css

8 years agoAdd translations
Jeremy Benoist [Sat, 5 Mar 2016 21:29:58 +0000 (22:29 +0100)] 
Add translations

8 years agoAdd listing clients
Jeremy Benoist [Sat, 5 Mar 2016 20:44:39 +0000 (21:44 +0100)] 
Add listing clients

Rename route to be more consistive (ie: prefixed with developer_)

8 years agoCleanup form
Jeremy Benoist [Sat, 5 Mar 2016 19:04:19 +0000 (20:04 +0100)] 
Cleanup form

- Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !)
- Fix HTML syntax in client_parameters
- Add developer link in baggy menu
- Fix space between link in material footer

8 years agoUpdate filters picture in documentation
Nicolas Lœuillet [Fri, 4 Mar 2016 15:20:04 +0000 (16:20 +0100)] 
Update filters picture in documentation

8 years agoMerge pull request #1750 from wallabag/v2-quickstart-documentation
Jeremy Benoist [Fri, 4 Mar 2016 15:14:39 +0000 (16:14 +0100)] 
Merge pull request #1750 from wallabag/v2-quickstart-documentation

Documentation about filters / Quickstart changes

8 years agoMerge pull request #1670 from wallabag/v2-mark-imported-articles-as-read
Nicolas Lœuillet [Fri, 4 Mar 2016 15:12:45 +0000 (16:12 +0100)] 
Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-read

Mark all imported articles as read

8 years agoupdate picture 1750/head
Nicolas Lœuillet [Fri, 4 Mar 2016 14:45:45 +0000 (15:45 +0100)] 
update picture

8 years agoMerge pull request #1754 from wallabag/v2-api-new-properties-light
Nicolas Lœuillet [Fri, 4 Mar 2016 11:31:27 +0000 (12:31 +0100)] 
Merge pull request #1754 from wallabag/v2-api-new-properties-light

Add starred & archive properties to API

8 years agoRemove 'content' from API 1754/head
Jeremy Benoist [Fri, 4 Mar 2016 10:40:48 +0000 (11:40 +0100)] 
Remove 'content' from API

Waiting to find a good solution to avoid side problem since user can no define the content

8 years agouse booleans instead of empty
Thomas Citharel [Tue, 9 Feb 2016 13:18:55 +0000 (14:18 +0100)] 
use booleans instead of empty

8 years agoadd more properties for entries #1634
Thomas Citharel [Mon, 8 Feb 2016 21:00:38 +0000 (22:00 +0100)] 
add more properties for entries #1634

8 years agoAdding test 1670/head
Jeremy Benoist [Fri, 4 Mar 2016 09:04:51 +0000 (10:04 +0100)] 
Adding test

Reformat json file (thanks pro.jsonlint.com)

8 years agoMerge pull request #1753 from Horgix/v2-typo-doc-en
Nicolas Lœuillet [Fri, 4 Mar 2016 05:17:19 +0000 (06:17 +0100)] 
Merge pull request #1753 from Horgix/v2-typo-doc-en

Doc: fix typo in php-hash ext name

8 years agoDoc: fix typo in php-hash ext name 1753/head
Alexis 'Horgix' Chotard [Fri, 4 Mar 2016 00:07:45 +0000 (01:07 +0100)] 
Doc: fix typo in php-hash ext name

8 years agocs & tests for wllbg v1 import
Thomas Citharel [Sat, 13 Feb 2016 15:20:00 +0000 (16:20 +0100)] 
cs & tests for wllbg v1 import

8 years agofrench translation & pocket
Thomas Citharel [Sat, 13 Feb 2016 13:32:16 +0000 (14:32 +0100)] 
french translation & pocket

8 years agoMark all imported articles as read
Thomas Citharel [Fri, 12 Feb 2016 14:59:13 +0000 (15:59 +0100)] 
Mark all imported articles as read

8 years agoDocumentation about filters (and some fixes in french documentation
Nicolas Lœuillet [Thu, 3 Mar 2016 07:06:18 +0000 (08:06 +0100)] 
Documentation about filters (and some fixes in french documentation

8 years agoAdd new links in quickstart
Nicolas Lœuillet [Thu, 3 Mar 2016 06:30:05 +0000 (07:30 +0100)] 
Add new links in quickstart

8 years agoMerge pull request #1745 from benages/v2
Nicolas Lœuillet [Wed, 2 Mar 2016 08:06:46 +0000 (09:06 +0100)] 
Merge pull request #1745 from benages/v2

V2 spanish translation

8 years agoSpanish translation 1745/head
Juanjo Benages [Tue, 1 Mar 2016 22:26:03 +0000 (23:26 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:36:21 +0000 (22:36 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:33:55 +0000 (22:33 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:24:34 +0000 (22:24 +0100)] 
Spanish translation

8 years agoSpanish translation
Juanjo Benages [Tue, 1 Mar 2016 21:20:42 +0000 (22:20 +0100)] 
Spanish translation

8 years agoMerge remote-tracking branch 'upstream/v2' into v2
Juanjo Benages [Tue, 1 Mar 2016 20:02:13 +0000 (21:02 +0100)] 
Merge remote-tracking branch 'upstream/v2' into v2

8 years agoStart of the spanish translation
Juanjo Benages [Tue, 1 Mar 2016 20:00:35 +0000 (21:00 +0100)] 
Start of the spanish translation

8 years agoMerge pull request #1743 from wallabag/v2-releasing-documentation
Jeremy Benoist [Tue, 1 Mar 2016 19:49:54 +0000 (20:49 +0100)] 
Merge pull request #1743 from wallabag/v2-releasing-documentation

Releasing documentation

8 years agoAdd steps in RELEASE_PROCESS 1743/head
Nicolas Lœuillet [Tue, 1 Mar 2016 19:21:18 +0000 (20:21 +0100)] 
Add steps in RELEASE_PROCESS

8 years agoReleasing documentation
Nicolas Lœuillet [Tue, 1 Mar 2016 14:39:22 +0000 (15:39 +0100)] 
Releasing documentation

8 years agoMerge pull request #1615 from bdunogier/release_process_doc
Nicolas Lœuillet [Tue, 1 Mar 2016 19:06:44 +0000 (20:06 +0100)] 
Merge pull request #1615 from bdunogier/release_process_doc

Added RELEASE_PROCESS document

8 years agoMerge pull request #1740 from goofy-bz/patch-6
Nicolas Lœuillet [Tue, 1 Mar 2016 16:00:49 +0000 (17:00 +0100)] 
Merge pull request #1740 from goofy-bz/patch-6

minor typofix again

8 years agofixing previous stuff and more 1740/head
goofy-bz [Tue, 1 Mar 2016 15:12:15 +0000 (16:12 +0100)] 
fixing previous stuff and more