]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoMerge pull request #1835 from wallabag/v2-prepare-v2 2.0.0
Thomas Citharel [Sun, 3 Apr 2016 20:11:17 +0000 (22:11 +0200)] 
Merge pull request #1835 from wallabag/v2-prepare-v2

:rocket: Prepare v2.0.0 :birthday:

8 years agoMerge pull request #1838 from wallabag/v2-hide-search
Thomas Citharel [Sun, 3 Apr 2016 18:47:16 +0000 (20:47 +0200)] 
Merge pull request #1838 from wallabag/v2-hide-search

Hide search buttons

8 years agoRemove useless CSS 1835/head
Nicolas Lœuillet [Sun, 3 Apr 2016 18:35:53 +0000 (20:35 +0200)] 
Remove useless CSS

8 years agoHide search buttons 1838/head
Nicolas Lœuillet [Sun, 3 Apr 2016 18:25:43 +0000 (20:25 +0200)] 
Hide search buttons

8 years ago:rocket: Prepare v2.0.0 :birthday:
Nicolas Lœuillet [Sun, 3 Apr 2016 08:08:22 +0000 (10:08 +0200)] 
:rocket: Prepare v2.0.0 :birthday:

8 years agoMerge pull request #1832 from wallabag/pdo-driver
Nicolas Lœuillet [Sat, 2 Apr 2016 12:57:10 +0000 (14:57 +0200)] 
Merge pull request #1832 from wallabag/pdo-driver

Check selected PDO driver on install

8 years agoCheck selected PDO driver on install 1832/head
Jeremy Benoist [Fri, 1 Apr 2016 14:44:50 +0000 (16:44 +0200)] 
Check selected PDO driver on install

Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.

8 years agoMerge branch 'Quent-in-v2' into v2
Jeremy Benoist [Fri, 1 Apr 2016 08:37:42 +0000 (10:37 +0200)] 
Merge branch 'Quent-in-v2' into v2

8 years agoAdd Occitan to available language
Jeremy Benoist [Fri, 1 Apr 2016 08:36:07 +0000 (10:36 +0200)] 
Add Occitan to available language

8 years agoFix quotes for OC
Jeremy Benoist [Fri, 1 Apr 2016 08:34:51 +0000 (10:34 +0200)] 
Fix quotes for OC

8 years agoMerge pull request #3 from j0k3r/patch-1 1829/head
Quent-in [Fri, 1 Apr 2016 08:18:16 +0000 (10:18 +0200)] 
Merge pull request #3 from j0k3r/patch-1

Fix simple quote

8 years agoFix simple quote
Jeremy Benoist [Fri, 1 Apr 2016 08:16:06 +0000 (10:16 +0200)] 
Fix simple quote

8 years agoOccitan version
Quent-in [Fri, 1 Apr 2016 06:55:26 +0000 (08:55 +0200)] 
Occitan version

8 years agoOC version
Quent-in [Fri, 1 Apr 2016 06:54:21 +0000 (08:54 +0200)] 
OC version

8 years agoUpdate oc version
Quent-in [Fri, 1 Apr 2016 06:51:29 +0000 (08:51 +0200)] 
Update oc version

Complet

8 years agoTrad. Occitan
Quent-in [Wed, 30 Mar 2016 11:17:40 +0000 (13:17 +0200)] 
Trad. Occitan

WIP

8 years agoMerge pull request #1822 from jami7/patch-4
Jeremy Benoist [Tue, 29 Mar 2016 05:34:20 +0000 (07:34 +0200)] 
Merge pull request #1822 from jami7/patch-4

Update messages.es.yml

8 years agoUpdate messages.es.yml 1822/head
jami7 [Mon, 28 Mar 2016 20:53:35 +0000 (10:53 -1000)] 
Update messages.es.yml

8 years agoMerge pull request #1820 from wallabag/import-refacto
Nicolas Lœuillet [Mon, 28 Mar 2016 16:52:22 +0000 (18:52 +0200)] 
Merge pull request #1820 from wallabag/import-refacto

Refacto wallabag import

8 years agoMerge pull request #1821 from jami7/patch-3
Thomas Citharel [Mon, 28 Mar 2016 16:04:13 +0000 (18:04 +0200)] 
Merge pull request #1821 from jami7/patch-3

Update messages.es.yml

8 years agoUpdate messages.es.yml 1821/head
jami7 [Mon, 28 Mar 2016 15:34:56 +0000 (05:34 -1000)] 
Update messages.es.yml

8 years agoRefacto wallabag import 1820/head
Jeremy Benoist [Mon, 28 Mar 2016 14:43:33 +0000 (16:43 +0200)] 
Refacto wallabag import

Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.

8 years agoRemove some complexicity in InstallCommand
Jeremy Benoist [Mon, 28 Mar 2016 12:18:50 +0000 (14:18 +0200)] 
Remove some complexicity in InstallCommand

8 years agoMerge pull request #1805 from wallabag/v2-assign-comma-tags
Nicolas Lœuillet [Mon, 28 Mar 2016 07:42:13 +0000 (09:42 +0200)] 
Merge pull request #1805 from wallabag/v2-assign-comma-tags

Fix #1768 Split tags with commas from UI

8 years agoMerge pull request #1819 from wallabag/cleanup
Nicolas Lœuillet [Mon, 28 Mar 2016 07:41:49 +0000 (09:41 +0200)] 
Merge pull request #1819 from wallabag/cleanup

Some cleanup

8 years agoMerge pull request #1818 from wallabag/v2-add-migration-doc
Nicolas Lœuillet [Mon, 28 Mar 2016 07:39:35 +0000 (09:39 +0200)] 
Merge pull request #1818 from wallabag/v2-add-migration-doc

add migration docs

8 years agoTags were not imported in wallabag v2 import 1819/head
Jeremy Benoist [Sun, 27 Mar 2016 21:32:55 +0000 (23:32 +0200)] 
Tags were not imported in wallabag v2 import

Also, simplify exportAs matching format

8 years agoFix some Scrutinizer issues
Jeremy Benoist [Sun, 27 Mar 2016 18:35:56 +0000 (20:35 +0200)] 
Fix some Scrutinizer issues

8 years agoSome cleanup
Jeremy Benoist [Sun, 27 Mar 2016 17:20:43 +0000 (19:20 +0200)] 
Some cleanup

- travis tabulation
- extra namespace definition in entities

8 years agoSimplify tag creation from entry 1805/head
Jeremy Benoist [Sun, 27 Mar 2016 15:09:33 +0000 (17:09 +0200)] 
Simplify tag creation from entry

Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job.
So it simplify the controller.

8 years agoadd migration docs 1818/head
Thomas Citharel [Sun, 27 Mar 2016 14:26:47 +0000 (16:26 +0200)] 
add migration docs

8 years agoMerge pull request #1817 from mruminski/v2
Nicolas Lœuillet [Sun, 27 Mar 2016 09:04:11 +0000 (11:04 +0200)] 
Merge pull request #1817 from mruminski/v2

Correct translation

8 years agoCorrect translation 1817/head
Mateusz Rumiński [Sat, 26 Mar 2016 17:00:03 +0000 (18:00 +0100)] 
Correct translation

8 years agoFix Indentation problem
Mateusz Rumiński [Sat, 26 Mar 2016 16:38:34 +0000 (17:38 +0100)] 
Fix Indentation problem

8 years agoUpdate messages.pl.yml
Mateusz Rumiński [Fri, 25 Mar 2016 18:20:37 +0000 (19:20 +0100)] 
Update messages.pl.yml

Complete polish translation of messages file

8 years agoCreate FOSUserBundle.pl.yml
Mateusz Rumiński [Fri, 25 Mar 2016 18:17:58 +0000 (19:17 +0100)] 
Create FOSUserBundle.pl.yml

Add polish version of FOSUserBundle file

8 years agoMerge pull request #1813 from wallabag/v2-translation-de
Jeremy Benoist [Thu, 24 Mar 2016 13:01:28 +0000 (14:01 +0100)] 
Merge pull request #1813 from wallabag/v2-translation-de

[v2] German translation

8 years agoComplete messages.de.yml 1813/head
Julian Oster [Thu, 24 Mar 2016 12:09:49 +0000 (13:09 +0100)] 
Complete messages.de.yml

8 years agoTranslate FOSUserBundle to german.
Julian Oster [Thu, 24 Mar 2016 11:50:58 +0000 (12:50 +0100)] 
Translate FOSUserBundle to german.

8 years agoTranslate CraueConfigBundle to german.
Julian Oster [Thu, 24 Mar 2016 11:50:47 +0000 (12:50 +0100)] 
Translate CraueConfigBundle to german.

8 years agoMerge pull request #1807 from nikaro/patch-1
Jeremy Benoist [Mon, 21 Mar 2016 16:17:52 +0000 (17:17 +0100)] 
Merge pull request #1807 from nikaro/patch-1

fix typo diaspora* share

8 years agofix type diaspora* share 1807/head
Nicolas [Mon, 21 Mar 2016 16:03:43 +0000 (17:03 +0100)] 
fix type diaspora* share

8 years agoMerge pull request #1806 from wallabag/v2-translation-flash-baggy
Jeremy Benoist [Mon, 21 Mar 2016 15:18:58 +0000 (16:18 +0100)] 
Merge pull request #1806 from wallabag/v2-translation-flash-baggy

Translate flash message in baggy theme

8 years agoTranslate flash message in baggy theme 1806/head
Nicolas Lœuillet [Mon, 21 Mar 2016 14:44:23 +0000 (15:44 +0100)] 
Translate flash message in baggy theme

8 years agoSplit tags with commas from UI
Nicolas Loeuillet [Mon, 21 Mar 2016 13:06:07 +0000 (14:06 +0100)] 
Split tags with commas from UI

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