]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
8 years agoAdjust export order 1633/head
Jeremy Benoist [Thu, 4 Feb 2016 19:41:30 +0000 (20:41 +0100)] 
Adjust export order

To be the same as on the entry page.
Also, export name doesn't need to be translated.

8 years agoCS
Jeremy Benoist [Mon, 1 Feb 2016 14:35:30 +0000 (15:35 +0100)] 
CS

8 years agoput the equals bar outside the loop
Thomas Citharel [Mon, 1 Feb 2016 13:43:02 +0000 (14:43 +0100)] 
put the equals bar outside the loop

8 years agoremove old dependancy
Thomas Citharel [Sun, 31 Jan 2016 13:13:42 +0000 (14:13 +0100)] 
remove old dependancy

8 years agofix tests
Thomas Citharel [Mon, 25 Jan 2016 21:25:55 +0000 (22:25 +0100)] 
fix tests

8 years agobetter display for txt
Thomas Citharel [Mon, 25 Jan 2016 21:02:44 +0000 (22:02 +0100)] 
better display for txt

8 years agoadd txt export
Thomas Citharel [Mon, 25 Jan 2016 16:31:45 +0000 (17:31 +0100)] 
add txt export

8 years agoMerge pull request #1642 from wallabag/v2-escape-preview
Jeremy Benoist [Thu, 4 Feb 2016 16:46:02 +0000 (17:46 +0100)] 
Merge pull request #1642 from wallabag/v2-escape-preview

Unescape content for Material card

8 years agoMerge pull request #1644 from wallabag/v2-enable-confirmation-parameter
Jeremy Benoist [Thu, 4 Feb 2016 16:45:50 +0000 (17:45 +0100)] 
Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter

Fix #1622: parameter for FosUser confirmation

8 years agoMerge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail
Jeremy Benoist [Thu, 4 Feb 2016 16:45:26 +0000 (17:45 +0100)] 
Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail

Fix #1643: fix the way to load the HTML template in 2factor auth

8 years agoFix #1643: fix the way to load the HTML template in 2factor auth 1645/head
Nicolas Lœuillet [Thu, 4 Feb 2016 16:29:14 +0000 (17:29 +0100)] 
Fix #1643: fix the way to load the HTML template in 2factor auth

8 years agoCS 1644/head
Nicolas Lœuillet [Thu, 4 Feb 2016 15:06:05 +0000 (16:06 +0100)] 
CS

8 years agoFix #1622: parameter for FosUser confirmation
Nicolas Lœuillet [Thu, 4 Feb 2016 13:21:33 +0000 (14:21 +0100)] 
Fix #1622: parameter for FosUser confirmation

8 years agoMerge pull request #1612 from wallabag/v2-settings-page
Nicolas Lœuillet [Thu, 4 Feb 2016 14:59:57 +0000 (15:59 +0100)] 
Merge pull request #1612 from wallabag/v2-settings-page

Settings page

8 years agoUnescape content for Material card 1642/head
Jeremy Benoist [Wed, 3 Feb 2016 19:45:15 +0000 (20:45 +0100)] 
Unescape content for Material card

Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&`.
Using |raw, the content isn't escape twice and is well displayed.

8 years agoMerge pull request #1641 from wallabag/v2-doc-typo
Jeremy Benoist [Mon, 1 Feb 2016 13:25:22 +0000 (14:25 +0100)] 
Merge pull request #1641 from wallabag/v2-doc-typo

Update import.rst to fix a doc typo

8 years agoUpdate import.rst 1641/head
Nicolas Lœuillet [Mon, 1 Feb 2016 13:22:19 +0000 (14:22 +0100)] 
Update import.rst

8 years agoMerge pull request #1601 from wallabag/v2-import-from-v2
Jeremy Benoist [Mon, 1 Feb 2016 13:17:20 +0000 (14:17 +0100)] 
Merge pull request #1601 from wallabag/v2-import-from-v2

[#1590] Add JSON import from wallabag v2

8 years agoMerge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
Jeremy Benoist [Mon, 1 Feb 2016 12:51:35 +0000 (13:51 +0100)] 
Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight

[#1604] First draft to fix SensioLabsInsight report

8 years agoMerge pull request #1639 from wallabag/v2-change-test-dbname
Jeremy Benoist [Mon, 1 Feb 2016 12:46:32 +0000 (13:46 +0100)] 
Merge pull request #1639 from wallabag/v2-change-test-dbname

Fix #1635: change database name for test environments (mysql/pgsql)

8 years agoFix Shaarli url traduction 1612/head
Jeremy Benoist [Mon, 1 Feb 2016 12:42:27 +0000 (13:42 +0100)] 
Fix Shaarli url traduction

8 years agoFix fos_user 1639/head
Nicolas Lœuillet [Mon, 1 Feb 2016 12:38:33 +0000 (13:38 +0100)] 
Fix fos_user

8 years agoFix #1635: change database name for test environments (mysql/pgsql)
Nicolas Lœuillet [Mon, 1 Feb 2016 12:22:34 +0000 (13:22 +0100)] 
Fix #1635: change database name for test environments (mysql/pgsql)

8 years agoFix from_email & fos_user
Jeremy Benoist [Sun, 31 Jan 2016 14:12:18 +0000 (15:12 +0100)] 
Fix from_email & fos_user

8 years agoAdd new export config
Jeremy Benoist [Sun, 31 Jan 2016 13:54:30 +0000 (14:54 +0100)] 
Add new export config

8 years agoFix permission to settings page
Jeremy Benoist [Fri, 22 Jan 2016 17:48:04 +0000 (18:48 +0100)] 
Fix permission to settings page

8 years agoCS
Jeremy Benoist [Thu, 21 Jan 2016 11:29:35 +0000 (12:29 +0100)] 
CS

8 years agoFix tests
Jeremy Benoist [Thu, 21 Jan 2016 11:24:35 +0000 (12:24 +0100)] 
Fix tests

8 years agoUse alias to get container parameters
Jeremy Benoist [Thu, 21 Jan 2016 11:24:27 +0000 (12:24 +0100)] 
Use alias to get container parameters

8 years agoCreate internal setting on install & fixtures
Jeremy Benoist [Thu, 21 Jan 2016 11:23:45 +0000 (12:23 +0100)] 
Create internal setting on install & fixtures

8 years agoWe don't need migration yet
Jeremy Benoist [Thu, 21 Jan 2016 11:21:11 +0000 (12:21 +0100)] 
We don't need migration yet

8 years agoAdd warning message for PocketImport
Jeremy Benoist [Thu, 21 Jan 2016 09:59:21 +0000 (10:59 +0100)] 
Add warning message for PocketImport

Warn user if pocket_consumer_key isn't defined

8 years agoAdd CraueConfig for internal settings
Jeremy Benoist [Thu, 21 Jan 2016 07:53:09 +0000 (08:53 +0100)] 
Add CraueConfig for internal settings

8 years agoAlways include warning message
Jeremy Benoist [Wed, 20 Jan 2016 19:00:12 +0000 (20:00 +0100)] 
Always include warning message

We'll remove it later, on the stable release

8 years agoMove default configuration out of parameters
Jeremy Benoist [Wed, 20 Jan 2016 18:54:57 +0000 (19:54 +0100)] 
Move default configuration out of parameters

These default configuration value shouldn't be in parameters.yml.

8 years agoMerge pull request #1630 from wallabag/v2-add-gitter-badge
Nicolas Lœuillet [Sun, 24 Jan 2016 19:02:43 +0000 (20:02 +0100)] 
Merge pull request #1630 from wallabag/v2-add-gitter-badge

Add @GitterHQ badge on README

8 years agoAdd @GitterHQ badge on README 1630/head
Nicolas Lœuillet [Sun, 24 Jan 2016 19:02:31 +0000 (20:02 +0100)] 
Add @GitterHQ badge on README

8 years agoMerge pull request #1629 from wallabag/fixexportformats
Nicolas Lœuillet [Sun, 24 Jan 2016 17:48:28 +0000 (18:48 +0100)] 
Merge pull request #1629 from wallabag/fixexportformats

fix #1620 and introduce new parameters to export

8 years agoMerge pull request #1628 from ogunkarakus/v2-turkish-translation
Nicolas Lœuillet [Sun, 24 Jan 2016 17:44:58 +0000 (18:44 +0100)] 
Merge pull request #1628 from ogunkarakus/v2-turkish-translation

Add Turkish translation

8 years agofix #1620 and introduce new parameters to export 1629/head
Thomas Citharel [Sun, 24 Jan 2016 17:21:09 +0000 (18:21 +0100)] 
fix #1620 and introduce new parameters to export

8 years agoAdd Turkish translation 1628/head
Ogün Karakuş [Sun, 24 Jan 2016 15:27:26 +0000 (17:27 +0200)] 
Add Turkish translation

Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
8 years agoMerge pull request #1625 from wallabag/v2-fix-1621
Jeremy Benoist [Sat, 23 Jan 2016 19:29:32 +0000 (20:29 +0100)] 
Merge pull request #1625 from wallabag/v2-fix-1621

[#1621] Add default address for FosUser

8 years ago[#1621] Add default address for FosUser 1625/head
Nicolas Lœuillet [Sat, 23 Jan 2016 13:30:56 +0000 (14:30 +0100)] 
[#1621] Add default address for FosUser

8 years agoSensioLabsInsight fixes 1605/head
Nicolas Lœuillet [Wed, 20 Jan 2016 16:16:17 +0000 (17:16 +0100)] 
SensioLabsInsight fixes

8 years ago[#1604] First draft to fix SensioLabsInsight report
Nicolas Lœuillet [Wed, 20 Jan 2016 15:24:48 +0000 (16:24 +0100)] 
[#1604] First draft to fix SensioLabsInsight report

8 years agoMerge pull request #1619 from wallabag/v2-themes-folder
Nicolas Lœuillet [Fri, 22 Jan 2016 19:54:17 +0000 (20:54 +0100)] 
Merge pull request #1619 from wallabag/v2-themes-folder

Move public assets for themes

8 years agoMove public assets for themes 1619/head
Jeremy Benoist [Fri, 22 Jan 2016 12:45:10 +0000 (13:45 +0100)] 
Move public assets for themes

So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`

8 years agoMerge pull request #1618 from wallabag/v2-readme
Jeremy Benoist [Fri, 22 Jan 2016 10:46:38 +0000 (11:46 +0100)] 
Merge pull request #1618 from wallabag/v2-readme

Updated version in README

8 years agoUpdated version in README 1618/head
Nicolas Lœuillet [Fri, 22 Jan 2016 10:43:18 +0000 (11:43 +0100)] 
Updated version in README

8 years agoMerge pull request #1614 from wallabag/v2-few-fixes
Nicolas Lœuillet [Fri, 22 Jan 2016 08:36:50 +0000 (09:36 +0100)] 
Merge pull request #1614 from wallabag/v2-few-fixes

Few fixes

8 years agoCS 1614/head
Jeremy Benoist [Fri, 22 Jan 2016 07:01:32 +0000 (08:01 +0100)] 
CS

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 ago[#1590] Add JSON import from wallabag v2 1601/head
Nicolas Lœuillet [Wed, 20 Jan 2016 13:37:01 +0000 (14:37 +0100)] 
[#1590] Add JSON import from wallabag v2

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/