]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoAdd for deleting rule from an other user
Jeremy Benoist [Thu, 21 Jan 2016 17:06:10 +0000 (18:06 +0100)] 
Add for deleting rule from an other user

8 years agoUse FOSUserEvents instead of c/p a controller
Jeremy Benoist [Thu, 21 Jan 2016 15:39:13 +0000 (16:39 +0100)] 
Use FOSUserEvents instead of c/p a controller

The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`.
Instead of copying the whole method we can simply use FOSUserEvents to handle that.

8 years agoFix bad type after using findByUrlAndUserId
Jeremy Benoist [Thu, 21 Jan 2016 15:37:25 +0000 (16:37 +0100)] 
Fix bad type after using findByUrlAndUserId

It returns an object since few commits this part of (untested) code still use an array.
Also add test for that part of code.

8 years agoFix bad redirection when adding a new user
Jeremy Benoist [Thu, 21 Jan 2016 15:36:30 +0000 (16:36 +0100)] 
Fix bad redirection when adding a new user

8 years agoAdd tests on TagAllCommand
Jeremy Benoist [Thu, 21 Jan 2016 15:36:17 +0000 (16:36 +0100)] 
Add tests on TagAllCommand

Some simple tests

8 years agoUse PHP7 random_bytes to generate RSS Token
Jeremy Benoist [Thu, 21 Jan 2016 15:35:41 +0000 (16:35 +0100)] 
Use PHP7 random_bytes to generate RSS Token

random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat

8 years agoMerge pull request #1565 from wallabag/v2-2fa-html
Nicolas Lœuillet [Thu, 21 Jan 2016 11:27:47 +0000 (12:27 +0100)] 
Merge pull request #1565 from wallabag/v2-2fa-html

Use HTML email for 2FA

8 years agoUpdate HTML 2FA template 1565/head
Jeremy Benoist [Wed, 20 Jan 2016 16:43:10 +0000 (17:43 +0100)] 
Update HTML 2FA template

Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)

8 years ago#1490 HTML in E-Mails
Alexandr Danilov [Tue, 19 Jan 2016 15:22:59 +0000 (18:22 +0300)] 
#1490 HTML in E-Mails

8 years agoCS
Jeremy Benoist [Sun, 10 Jan 2016 12:01:00 +0000 (13:01 +0100)] 
CS

8 years agoUse HTML email for 2FA
Jeremy Benoist [Sun, 10 Jan 2016 11:49:43 +0000 (12:49 +0100)] 
Use HTML email for 2FA

Related to #1490

8 years agoMerge pull request #1610 from wallabag/v2-composer-lock-release
Nicolas Lœuillet [Thu, 21 Jan 2016 10:02:18 +0000 (11:02 +0100)] 
Merge pull request #1610 from wallabag/v2-composer-lock-release

Disable xdebug all the time

8 years agoDisable xdebug all the time 1610/head
Jeremy Benoist [Thu, 21 Jan 2016 07:59:58 +0000 (08:59 +0100)] 
Disable xdebug all the time

Use travis_wait to avoid travis timeout on `composer up`
Jump to `memory_limit -1` for `composer up`
Also, since composer.lock is ignored, we can remove it.

8 years agoMerge pull request #1606 from wallabag/v2-tag-cascade
Nicolas Lœuillet [Thu, 21 Jan 2016 07:38:37 +0000 (08:38 +0100)] 
Merge pull request #1606 from wallabag/v2-tag-cascade

Remove tag relation when removing an entry

8 years agoMerge pull request #1607 from wallabag/v2-composer-lock
Nicolas Lœuillet [Thu, 21 Jan 2016 07:28:52 +0000 (08:28 +0100)] 
Merge pull request #1607 from wallabag/v2-composer-lock

Ignore composer.lock

8 years agoIgnore composer.lock 1607/head
Jeremy Benoist [Wed, 20 Jan 2016 17:49:45 +0000 (18:49 +0100)] 
Ignore composer.lock

Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor.
Mostly because conflict are too frequent.

By ignoring composer.lock we ease the PR submission and rebase.

BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it.

Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.

8 years agoRemove tag relation when removing an entry 1606/head
Jeremy Benoist [Wed, 20 Jan 2016 17:35:57 +0000 (18:35 +0100)] 
Remove tag relation when removing an entry

Fix #1453

8 years agoMerge pull request #1599 from wallabag/v2-fix-pt-documentation
Nicolas Lœuillet [Wed, 20 Jan 2016 12:00:43 +0000 (13:00 +0100)] 
Merge pull request #1599 from wallabag/v2-fix-pt-documentation

Add configuration for portuguese documentation

8 years agoAdd configuration for portuguese documentation 1599/head
Nicolas Lœuillet [Wed, 20 Jan 2016 11:54:19 +0000 (12:54 +0100)] 
Add configuration for portuguese documentation

8 years agoMerge pull request #1594 from araujo0205/patch-1
Nicolas Lœuillet [Wed, 20 Jan 2016 11:09:18 +0000 (12:09 +0100)] 
Merge pull request #1594 from araujo0205/patch-1

Create index.rst

8 years agoCreate index.rst 1594/head
araujo0205 [Tue, 19 Jan 2016 18:01:28 +0000 (16:01 -0200)] 
Create index.rst

8 years agoMerge pull request #1587 from wallabag/v2-translator
Nicolas Lœuillet [Mon, 18 Jan 2016 08:16:01 +0000 (09:16 +0100)] 
Merge pull request #1587 from wallabag/v2-translator

Use translator interface instead of final class

8 years agoUse translator interface instead of final class 1587/head
Jeremy Benoist [Sun, 17 Jan 2016 11:52:30 +0000 (12:52 +0100)] 
Use translator interface instead of final class

Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585

8 years agoMerge pull request #1584 from wallabag/v2-cleanup
Jeremy Benoist [Fri, 15 Jan 2016 15:29:06 +0000 (16:29 +0100)] 
Merge pull request #1584 from wallabag/v2-cleanup

some cleanup

8 years agosome cleanup: 1584/head
Nicolas Lœuillet [Fri, 15 Jan 2016 15:07:57 +0000 (16:07 +0100)] 
some cleanup:
* move capistrano config files
* remove useless files

8 years agoMerge pull request #1564 from wallabag/v2-remove-flattr
Jeremy Benoist [Fri, 15 Jan 2016 15:01:13 +0000 (16:01 +0100)] 
Merge pull request #1564 from wallabag/v2-remove-flattr

Remove Flattr references

8 years agoMerge pull request #1583 from wallabag/v2-fix-delete
Nicolas Lœuillet [Fri, 15 Jan 2016 14:47:13 +0000 (15:47 +0100)] 
Merge pull request #1583 from wallabag/v2-fix-delete

Fix `findOneByUrl` side effect in tests

8 years agoremove flattr on about page 1564/head
Nicolas Lœuillet [Fri, 15 Jan 2016 14:09:43 +0000 (15:09 +0100)] 
remove flattr on about page

8 years agoMerge pull request #1524 from wallabag/sf2.8
Nicolas Lœuillet [Fri, 15 Jan 2016 14:38:31 +0000 (15:38 +0100)] 
Merge pull request #1524 from wallabag/sf2.8

Upgrade to Symfony 3.0

8 years agoFix `findOneByUrl` side effect in tests 1583/head
Jeremy Benoist [Fri, 15 Jan 2016 14:28:22 +0000 (15:28 +0100)] 
Fix `findOneByUrl` side effect in tests

Fix #1566

8 years agoMerge pull request #1560 from wallabag/v2-quickstart
Jeremy Benoist [Fri, 15 Jan 2016 14:21:43 +0000 (15:21 +0100)] 
Merge pull request #1560 from wallabag/v2-quickstart

Fix #1501 Quickstart for beginners

8 years agoQuickstart for beginners 1560/head
Nicolas Lœuillet [Sat, 9 Jan 2016 13:34:49 +0000 (14:34 +0100)] 
Quickstart for beginners

8 years agoUpdate graby stuff 1524/head
Jeremy Benoist [Fri, 15 Jan 2016 10:05:51 +0000 (11:05 +0100)] 
Update graby stuff

8 years agoUpdate readme & fix console permission
Jeremy Benoist [Fri, 15 Jan 2016 08:34:09 +0000 (09:34 +0100)] 
Update readme & fix console permission

8 years agoLast deps update
Jeremy Benoist [Fri, 15 Jan 2016 06:55:18 +0000 (07:55 +0100)] 
Last deps update

8 years agoAdd assets config
Jeremy Benoist [Thu, 14 Jan 2016 17:35:59 +0000 (18:35 +0100)] 
Add assets config

To avoid :
> Twig_Error_Syntax: Unknown "asset" function in

8 years agoUpdate path in build file
Jeremy Benoist [Thu, 14 Jan 2016 17:27:36 +0000 (18:27 +0100)] 
Update path in build file

8 years agoUpdate to Symfony 3.0.x
Jeremy Benoist [Thu, 14 Jan 2016 17:23:03 +0000 (18:23 +0100)] 
Update to Symfony 3.0.x

8 years agoSwitch to Symfony 3 structure
Jeremy Benoist [Thu, 14 Jan 2016 17:15:07 +0000 (18:15 +0100)] 
Switch to Symfony 3 structure

8 years agoRemove some commented code
Jeremy Benoist [Thu, 14 Jan 2016 13:10:33 +0000 (14:10 +0100)] 
Remove some commented code

8 years agoUpdate to friendsofsymfony/oauth-server-bundle@1.5.0-BETA
Jeremy Benoist [Thu, 14 Jan 2016 12:46:30 +0000 (13:46 +0100)] 
Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA

8 years agoFix Pocket generateUrl parameters
Jeremy Benoist [Wed, 13 Jan 2016 21:53:36 +0000 (22:53 +0100)] 
Fix Pocket generateUrl parameters

8 years agoUpdate deps
Jeremy Benoist [Wed, 13 Jan 2016 21:34:54 +0000 (22:34 +0100)] 
Update deps

LexikFormFilterBundle & RulerZBundle are now Symfony 3 compatible

There are still some issue with FOSOAuthServerBundle

8 years agoFix recent update
Jeremy Benoist [Sat, 9 Jan 2016 17:38:40 +0000 (18:38 +0100)] 
Fix recent update

- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)

8 years agoTwoFactorBundle -> 2.0
Jeremy Benoist [Thu, 31 Dec 2015 17:51:35 +0000 (18:51 +0100)] 
TwoFactorBundle -> 2.0

8 years agoSwitch to psr-4
Jeremy Benoist [Tue, 22 Dec 2015 12:09:10 +0000 (13:09 +0100)] 
Switch to psr-4

8 years agoUpdate bundle & stock file
Jeremy Benoist [Tue, 22 Dec 2015 12:00:37 +0000 (13:00 +0100)] 
Update bundle & stock file

- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler

8 years agoSymfony Upgrade Fixer FTW
Jeremy Benoist [Tue, 22 Dec 2015 09:16:34 +0000 (10:16 +0100)] 
Symfony Upgrade Fixer FTW

symfony-upgrade-fixer fix src/Wallabag/

8 years agoImprove composer.json
Jeremy Benoist [Tue, 22 Dec 2015 08:34:32 +0000 (09:34 +0100)] 
Improve composer.json

Following great article from Jordi: http://seld.be/notes/new-composer-patterns

Changelogs summary:

 - paragonie/random_compat updated from 1.1.1 to 1.1.4
   See changes: https://github.com/paragonie/random_compat/compare/1.1.1...1.1.4
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.4

 - doctrine/cache updated from v1.5.2 to v1.5.4
   See changes: https://github.com/doctrine/cache/compare/v1.5.2...v1.5.4
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.4

 - sensio/framework-extra-bundle updated from v3.0.11 to v3.0.12
   See changes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/compare/v3.0.11...v3.0.12
   Release notes: https://github.com/sensiolabs/SensioFrameworkExtraBundle/releases/tag/v3.0.12

 - nelmio/cors-bundle updated from 1.4.0 to 1.4.1
   See changes: https://github.com/nelmio/NelmioCorsBundle/compare/1.4.0...1.4.1
   Release notes: https://github.com/nelmio/NelmioCorsBundle/releases/tag/1.4.1

 - friendsofsymfony/rest-bundle updated from 1.7.4 to 1.7.6
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.4...1.7.6
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.6

 - nelmio/api-doc-bundle updated from 2.11.0 to 2.11.1
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.0...2.11.1
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.1

 - neitanod/forceutf8 updated from v1.5 to v2.0
   See changes: https://github.com/neitanod/forceutf8/compare/v1.5...v2.0
   Release notes: https://github.com/neitanod/forceutf8/releases/tag/v2.0

 - j0k3r/graby-site-config updated from 1.0.9 to 1.0.10
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.9...1.0.10
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.10

 - j0k3r/graby updated from 1.0.6 to 1.0.7
   See changes: https://github.com/j0k3r/graby/compare/1.0.6...1.0.7
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.7

 - sebastian/diff updated from 1.4.0 to 1.4.1
   See changes: https://github.com/sebastianbergmann/diff/compare/1.4.0...1.4.1
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.1

 - phpunit/phpunit updated from 4.8.19 to 4.8.21
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.21
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.21

 - kphoen/rulerz updated from 0.16.1 to 0.16.2
   See changes: https://github.com/K-Phoen/rulerz/compare/0.16.1...0.16.2
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.2

8 years agoWallabag now require PHP >= 5.5
Jeremy Benoist [Sun, 6 Dec 2015 15:14:47 +0000 (16:14 +0100)] 
Wallabag now require PHP >= 5.5

See https://github.com/K-Phoen/rulerz/pull/21/files#diff-b5d0ee8c97c7abd7e3fa29b9a27d1780

8 years agoRemove weak deprecation :boom:
Jeremy Benoist [Sun, 6 Dec 2015 14:00:26 +0000 (15:00 +0100)] 
Remove weak deprecation :boom:

8 years agoUpdate deps
Jeremy Benoist [Sun, 6 Dec 2015 13:39:01 +0000 (14:39 +0100)] 
Update deps

Changelogs summary:

 - doctrine/cache updated from v1.5.1 to v1.5.2
   See changes: https://github.com/doctrine/cache/compare/v1.5.1...v1.5.2
   Release notes: https://github.com/doctrine/cache/releases/tag/v1.5.2

 - doctrine/common updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/common/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/common/releases/tag/v2.5.2

 - symfony/polyfill-mbstring installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.0.0

 - symfony/polyfill-util installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-util/releases/tag/v1.0.0

 - paragonie/random_compat installed in version 1.1.1
   Release notes: https://github.com/paragonie/random_compat/releases/tag/1.1.1

 - symfony/polyfill-php70 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php70/releases/tag/v1.0.0

 - symfony/polyfill-php56 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php56/releases/tag/v1.0.0

 - ircmaxell/password-compat installed in version v1.0.4
   Release notes: https://github.com/ircmaxell/password_compat/releases/tag/v1.0.4

 - symfony/polyfill-php55 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php55/releases/tag/v1.0.0

 - symfony/polyfill-php54 installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-php54/releases/tag/v1.0.0

 - symfony/polyfill-intl-icu installed in version v1.0.0
   Release notes: https://github.com/symfony/polyfill-intl-icu/releases/tag/v1.0.0

 - symfony/symfony updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/symfony/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/symfony/releases/tag/v2.8.0

 - symfony/security-acl installed in version v2.7.7
   Release notes: https://github.com/symfony/security-acl/releases/tag/v2.7.7

 - doctrine/orm updated from v2.5.1 to v2.5.2
   See changes: https://github.com/doctrine/doctrine2/compare/v2.5.1...v2.5.2
   Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.2

 - kriswallsmith/assetic updated from v1.3.1 to v1.3.2
   See changes: https://github.com/kriswallsmith/assetic/compare/v1.3.1...v1.3.2
   Release notes: https://github.com/kriswallsmith/assetic/releases/tag/v1.3.2

 - symfony/assetic-bundle updated from v2.7.0 to v2.7.1
   See changes: https://github.com/symfony/assetic-bundle/compare/v2.7.0...v2.7.1
   Release notes: https://github.com/symfony/assetic-bundle/releases/tag/v2.7.1

 - symfony/swiftmailer-bundle updated from v2.3.8 to v2.3.9
   See changes: https://github.com/symfony/swiftmailer-bundle/compare/v2.3.8...v2.3.9
   Release notes: https://github.com/symfony/swiftmailer-bundle/releases/tag/v2.3.9

 - symfony/monolog-bundle updated from 2.8.1 to v2.8.2
   See changes: https://github.com/symfony/monolog-bundle/compare/2.8.1...v2.8.2
   Release notes: https://github.com/symfony/monolog-bundle/releases/tag/v2.8.2

 - sensio/distribution-bundle updated from v3.0.33 to v3.0.34
   See changes: https://github.com/sensiolabs/SensioDistributionBundle/compare/v3.0.33...v3.0.34
   Release notes: https://github.com/sensiolabs/SensioDistributionBundle/releases/tag/v3.0.34

 - friendsofsymfony/rest-bundle updated from 1.7.2 to 1.7.4
   See changes: https://github.com/FriendsOfSymfony/FOSRestBundle/compare/1.7.2...1.7.4
   Release notes: https://github.com/FriendsOfSymfony/FOSRestBundle/releases/tag/1.7.4

 - nelmio/api-doc-bundle updated from 2.10.3 to 2.11.0
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.10.3...2.11.0
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.0

 - j0k3r/graby-site-config updated from 1.0.6 to 1.0.9
   See changes: https://github.com/j0k3r/graby-site-config/compare/1.0.6...1.0.9
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.9

 - j0k3r/safecurl updated from v1.1.1 to 2.0.2
   See changes: https://github.com/j0k3r/safecurl/compare/v1.1.1...2.0.2
   Release notes: https://github.com/j0k3r/safecurl/releases/tag/2.0.2

 - j0k3r/graby updated from 1.0.4 to 1.0.6
   See changes: https://github.com/j0k3r/graby/compare/1.0.4...1.0.6
   Release notes: https://github.com/j0k3r/graby/releases/tag/1.0.6

 - scheb/two-factor-bundle updated from v1.4.7 to v1.5.0
   See changes: https://github.com/scheb/two-factor-bundle/compare/v1.4.7...v1.5.0
   Release notes: https://github.com/scheb/two-factor-bundle/releases/tag/v1.5.0

 - sebastian/recursion-context updated from 1.0.1 to 1.0.2
   See changes: https://github.com/sebastianbergmann/recursion-context/compare/1.0.1...1.0.2
   Release notes: https://github.com/sebastianbergmann/recursion-context/releases/tag/1.0.2

 - sebastian/environment updated from 1.3.2 to 1.3.3
   See changes: https://github.com/sebastianbergmann/environment/compare/1.3.2...1.3.3
   Release notes: https://github.com/sebastianbergmann/environment/releases/tag/1.3.3

 - sebastian/diff updated from 1.3.0 to 1.4.0
   See changes: https://github.com/sebastianbergmann/diff/compare/1.3.0...1.4.0
   Release notes: https://github.com/sebastianbergmann/diff/releases/tag/1.4.0

 - phpunit/phpunit updated from 4.8.18 to 4.8.19
   See changes: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19
   Release notes: https://github.com/sebastianbergmann/phpunit/releases/tag/4.8.19

 - symfony/phpunit-bridge updated from v2.7.7 to v2.8.0
   See changes: https://github.com/symfony/phpunit-bridge/compare/v2.7.7...v2.8.0
   Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v2.8.0

 - doctrine/doctrine-cache-bundle updated from 1.2.1 to 1.2.2
   See changes: https://github.com/doctrine/DoctrineCacheBundle/compare/1.2.1...1.2.2
   Release notes: https://github.com/doctrine/DoctrineCacheBundle/releases/tag/1.2.2

 - doctrine/doctrine-bundle updated from v1.5.2 to 1.6.1
   See changes: https://github.com/doctrine/DoctrineBundle/compare/v1.5.2...1.6.1
   Release notes: https://github.com/doctrine/DoctrineBundle/releases/tag/1.6.1

 - phpzip/phpzip updated from 2.0.7 to 2.0.8
   See changes: https://github.com/Grandt/PHPZip/compare/2.0.7...2.0.8
   Release notes: https://github.com/Grandt/PHPZip/releases/tag/2.0.8

 - kphoen/rulerz updated from 0.14.0 to 0.16.1
   See changes: https://github.com/K-Phoen/rulerz/compare/0.14.0...0.16.1
   Release notes: https://github.com/K-Phoen/rulerz/releases/tag/0.16.1

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/45d6f40...e39b040

8 years agoMerge pull request #1574 from jjanvier/readme
Jeremy Benoist [Thu, 14 Jan 2016 06:50:55 +0000 (07:50 +0100)] 
Merge pull request #1574 from jjanvier/readme

Fix typo and set version in the README

8 years agoFix typo and set version in the README 1574/head
Julien Janvier (jjanvier) [Wed, 13 Jan 2016 23:41:08 +0000 (00:41 +0100)] 
Fix typo and set version in the README

8 years agoMerge pull request #1561 from FabienM/docker-compose
Nicolas Lœuillet [Mon, 11 Jan 2016 08:08:39 +0000 (09:08 +0100)] 
Merge pull request #1561 from FabienM/docker-compose

Add basic docker-compose configuration

8 years agoAdd documentation to run docker-compose 1561/head
Fabien MEURILLON [Sat, 9 Jan 2016 18:02:24 +0000 (19:02 +0100)] 
Add documentation to run docker-compose

8 years agoAdd Docker configuration for Postgres and MariaDB
Fabien MEURILLON [Sat, 9 Jan 2016 16:27:21 +0000 (17:27 +0100)] 
Add Docker configuration for Postgres and MariaDB

8 years agoAdd basic docker-compose configuration
Fabien MEURILLON [Sat, 9 Jan 2016 13:47:32 +0000 (14:47 +0100)] 
Add basic docker-compose configuration

8 years agoMerge pull request #1563 from wallabag/v2-fix-1394
Jeremy Benoist [Sun, 10 Jan 2016 09:20:16 +0000 (10:20 +0100)] 
Merge pull request #1563 from wallabag/v2-fix-1394

#1394 Fixed 'mark as read' and 'mark as unread' links

8 years agoMerge pull request #1562 from wallabag/v2-add-import-baggy
Jeremy Benoist [Sun, 10 Jan 2016 09:17:27 +0000 (10:17 +0100)] 
Merge pull request #1562 from wallabag/v2-add-import-baggy

add import link on baggy theme

8 years agoFixed 'mark as read' and 'mark as unread' links 1563/head
Nicolas Lœuillet [Sat, 9 Jan 2016 21:20:19 +0000 (22:20 +0100)] 
Fixed 'mark as read' and 'mark as unread' links

8 years agoadd import link on baggy theme 1562/head
Nicolas Lœuillet [Sat, 9 Jan 2016 19:33:09 +0000 (20:33 +0100)] 
add import link on baggy theme

8 years agoMerge pull request #1558 from wallabag/v2-documentation
Nicolas Lœuillet [Sat, 9 Jan 2016 16:33:27 +0000 (17:33 +0100)] 
Merge pull request #1558 from wallabag/v2-documentation

[v2] documentation cleaning

8 years agoMerge pull request #1559 from wallabag/v2-doctrine-migrations
Jeremy Benoist [Sat, 9 Jan 2016 13:43:06 +0000 (14:43 +0100)] 
Merge pull request #1559 from wallabag/v2-doctrine-migrations

Installation & configuration of Doctrine Migrations

8 years agoUpdate deps 1559/head
Jeremy Benoist [Sat, 9 Jan 2016 13:24:09 +0000 (14:24 +0100)] 
Update deps

Changelogs summary:

 - doctrine/dbal updated from v2.5.3 to v2.5.4
   See changes: https://github.com/doctrine/dbal/compare/v2.5.3...v2.5.4
   Release notes: https://github.com/doctrine/dbal/releases/tag/v2.5.4

 - doctrine/orm updated from v2.5.3 to v2.5.4
   See changes: https://github.com/doctrine/doctrine2/compare/v2.5.3...v2.5.4
   Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.4

 - nelmio/api-doc-bundle updated from 2.11.1 to 2.11.2
   See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.1...2.11.2
   Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.2

 - friendsofsymfony/user-bundle updated from dev-master to dev-master
   See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/e5e7a2b...6ccff96

8 years agodocumentation cleaning 1558/head
Nicolas Lœuillet [Fri, 8 Jan 2016 14:02:51 +0000 (15:02 +0100)] 
documentation cleaning

8 years agoInstallation & configuration of Doctrine Migrations
Nicolas Lœuillet [Fri, 8 Jan 2016 15:27:29 +0000 (16:27 +0100)] 
Installation & configuration of Doctrine Migrations

8 years agoMerge pull request #1493 from wallabag/v2-pocket-import 2.0.0-alpha.1
Jeremy Benoist [Thu, 7 Jan 2016 21:15:08 +0000 (22:15 +0100)] 
Merge pull request #1493 from wallabag/v2-pocket-import

v2 – 1st draft for Pocket import via API & Wallabag v1 import

8 years agoupdated tests 1493/head
Nicolas Lœuillet [Wed, 6 Jan 2016 05:34:57 +0000 (06:34 +0100)] 
updated tests

8 years agoMerge pull request #1553 from wallabag/v2-hide-export-button
Jeremy Benoist [Wed, 6 Jan 2016 20:25:41 +0000 (21:25 +0100)] 
Merge pull request #1553 from wallabag/v2-hide-export-button

Hide export button if we are not on entries list

8 years agoHide export button if we are not on entries list 1553/head
Nicolas Lœuillet [Wed, 6 Jan 2016 06:47:09 +0000 (07:47 +0100)] 
Hide export button if we are not on entries list

8 years agoAdded french translations
Nicolas Lœuillet [Tue, 5 Jan 2016 21:38:09 +0000 (22:38 +0100)] 
Added french translations

8 years agoFew phpDoc fix
Jeremy Benoist [Sun, 3 Jan 2016 09:59:55 +0000 (10:59 +0100)] 
Few phpDoc fix

And some little mistakes

8 years agoFix tag related test for Pocket
Jeremy Benoist [Sun, 3 Jan 2016 09:32:56 +0000 (10:32 +0100)] 
Fix tag related test for Pocket

8 years agoUpdate deps
Jeremy Benoist [Sat, 2 Jan 2016 22:31:41 +0000 (23:31 +0100)] 
Update deps

8 years agoRemove real consumer key
Jeremy Benoist [Thu, 31 Dec 2015 10:25:04 +0000 (11:25 +0100)] 
Remove real consumer key

We should never commit them :)

8 years agoAdd tagged services for import
Jeremy Benoist [Thu, 31 Dec 2015 10:24:46 +0000 (11:24 +0100)] 
Add tagged services for import

- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests

8 years agoRewrote Wallabag v1 import
Jeremy Benoist [Wed, 30 Dec 2015 12:26:30 +0000 (13:26 +0100)] 
Rewrote Wallabag v1 import

8 years agoRewrote Pocket Import
Jeremy Benoist [Wed, 30 Dec 2015 11:23:51 +0000 (12:23 +0100)] 
Rewrote Pocket Import

For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).

8 years agoFix the way to check for an existing entry
Jeremy Benoist [Wed, 30 Dec 2015 11:19:15 +0000 (12:19 +0100)] 
Fix the way to check for an existing entry

Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)

8 years agoUpdate after previous merge
Jeremy Benoist [Wed, 30 Dec 2015 09:06:45 +0000 (10:06 +0100)] 
Update after previous merge

PR #1443 was merged into this branch to handle all import type in the same place.

8 years agoFirst test on PocketImport
Jeremy Benoist [Thu, 24 Dec 2015 14:24:18 +0000 (15:24 +0100)] 
First test on PocketImport

Giving ability to define the Client add abitliy to easliy test the import.

8 years agoUpdate url & service name
Jeremy Benoist [Thu, 24 Dec 2015 14:22:56 +0000 (15:22 +0100)] 
Update url & service name

Prefix ur with service namel: [service]_[route name]
Add comment in Interface

8 years agoChange the way to check for an existing entry
Jeremy Benoist [Thu, 24 Dec 2015 14:19:50 +0000 (15:19 +0100)] 
Change the way to check for an existing entry

The repository method return the entry found or false if nothing exists.

8 years agoUpdate deps
Jeremy Benoist [Thu, 24 Dec 2015 13:06:55 +0000 (14:06 +0100)] 
Update deps

8 years ago- remove importers configuration
Nicolas Lœuillet [Mon, 26 Oct 2015 14:49:44 +0000 (15:49 +0100)] 
- remove importers configuration
- add check on userId for findOneByURL for entries

8 years agofix #1502 avoid duplicate entry and store pocket url in config
Nicolas Lœuillet [Mon, 26 Oct 2015 13:38:24 +0000 (14:38 +0100)] 
fix #1502 avoid duplicate entry and store pocket url in config

8 years agoassign tags to entries and add lastPocketImport attribute to user
Nicolas Lœuillet [Mon, 26 Oct 2015 09:55:35 +0000 (10:55 +0100)] 
assign tags to entries and add lastPocketImport attribute to user

8 years agocreate ImportController to list importers
Nicolas Lœuillet [Fri, 23 Oct 2015 12:45:50 +0000 (14:45 +0200)] 
create ImportController to list importers

8 years agoservice call
Nicolas Lœuillet [Fri, 23 Oct 2015 12:09:19 +0000 (14:09 +0200)] 
service call

8 years agoforgot test parameters
Nicolas Lœuillet [Fri, 23 Oct 2015 12:04:43 +0000 (14:04 +0200)] 
forgot test parameters

8 years agorefactor pocket import
Nicolas Lœuillet [Fri, 23 Oct 2015 12:01:27 +0000 (14:01 +0200)] 
refactor pocket import

8 years ago1st draft for Pocket import via API
Nicolas Lœuillet [Tue, 20 Oct 2015 11:58:13 +0000 (13:58 +0200)] 
1st draft for Pocket import via API

8 years agoadd docs for Import feature
Nicolas Lœuillet [Fri, 23 Oct 2015 08:14:22 +0000 (10:14 +0200)] 
add docs for Import feature

8 years agoform to upload file
Nicolas Lœuillet [Thu, 22 Oct 2015 14:57:56 +0000 (16:57 +0200)] 
form to upload file

8 years agocreate controller to launch import command
Nicolas Lœuillet [Wed, 30 Sep 2015 13:10:46 +0000 (15:10 +0200)] 
create controller to launch import command

8 years agouserId is now set in parameters
Nicolas Lœuillet [Wed, 30 Sep 2015 12:22:38 +0000 (14:22 +0200)] 
userId is now set in parameters

8 years agofirst draft for json import, needed for wallabag v1 migration
Nicolas Lœuillet [Wed, 30 Sep 2015 09:43:25 +0000 (11:43 +0200)] 
first draft for json import, needed for wallabag v1 migration

8 years agoMerge pull request #1545 from wallabag/v2-user-tag
Nicolas Lœuillet [Sat, 2 Jan 2016 11:46:52 +0000 (12:46 +0100)] 
Merge pull request #1545 from wallabag/v2-user-tag

v2 – Remove user reference in tag

8 years agoMerge pull request #1546 from wallabag/v2-reload-content
Nicolas Lœuillet [Sat, 2 Jan 2016 11:46:09 +0000 (12:46 +0100)] 
Merge pull request #1546 from wallabag/v2-reload-content

v2 – Ability to reload an entry