]>
git.immae.eu Git - github/wallabag/wallabag.git/log
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.
Jeremy Benoist [Mon, 1 Feb 2016 14:35:30 +0000 (15:35 +0100)]
CS
Thomas Citharel [Mon, 1 Feb 2016 13:43:02 +0000 (14:43 +0100)]
put the equals bar outside the loop
Thomas Citharel [Sun, 31 Jan 2016 13:13:42 +0000 (14:13 +0100)]
remove old dependancy
Thomas Citharel [Mon, 25 Jan 2016 21:25:55 +0000 (22:25 +0100)]
fix tests
Thomas Citharel [Mon, 25 Jan 2016 21:02:44 +0000 (22:02 +0100)]
better display for txt
Thomas Citharel [Mon, 25 Jan 2016 16:31:45 +0000 (17:31 +0100)]
add txt export
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
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
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
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
Nicolas Lœuillet [Thu, 4 Feb 2016 15:06:05 +0000 (16:06 +0100)]
CS
Nicolas Lœuillet [Thu, 4 Feb 2016 13:21:33 +0000 (14:21 +0100)]
Fix #1622: parameter for FosUser confirmation
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
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.
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
Nicolas Lœuillet [Mon, 1 Feb 2016 13:22:19 +0000 (14:22 +0100)]
Update import.rst
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
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
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)
Jeremy Benoist [Mon, 1 Feb 2016 12:42:27 +0000 (13:42 +0100)]
Fix Shaarli url traduction
Nicolas Lœuillet [Mon, 1 Feb 2016 12:38:33 +0000 (13:38 +0100)]
Fix fos_user
Nicolas Lœuillet [Mon, 1 Feb 2016 12:22:34 +0000 (13:22 +0100)]
Fix #1635: change database name for test environments (mysql/pgsql)
Jeremy Benoist [Sun, 31 Jan 2016 14:12:18 +0000 (15:12 +0100)]
Fix from_email & fos_user
Jeremy Benoist [Sun, 31 Jan 2016 13:54:30 +0000 (14:54 +0100)]
Add new export config
Jeremy Benoist [Fri, 22 Jan 2016 17:48:04 +0000 (18:48 +0100)]
Fix permission to settings page
Jeremy Benoist [Thu, 21 Jan 2016 11:29:35 +0000 (12:29 +0100)]
CS
Jeremy Benoist [Thu, 21 Jan 2016 11:24:35 +0000 (12:24 +0100)]
Fix tests
Jeremy Benoist [Thu, 21 Jan 2016 11:24:27 +0000 (12:24 +0100)]
Use alias to get container parameters
Jeremy Benoist [Thu, 21 Jan 2016 11:23:45 +0000 (12:23 +0100)]
Create internal setting on install & fixtures
Jeremy Benoist [Thu, 21 Jan 2016 11:21:11 +0000 (12:21 +0100)]
We don't need migration yet
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
Jeremy Benoist [Thu, 21 Jan 2016 07:53:09 +0000 (08:53 +0100)]
Add CraueConfig for internal settings
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
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.
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
Nicolas Lœuillet [Sun, 24 Jan 2016 19:02:31 +0000 (20:02 +0100)]
Add @GitterHQ badge on README
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
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
Thomas Citharel [Sun, 24 Jan 2016 17:21:09 +0000 (18:21 +0100)]
fix #1620 and introduce new parameters to export
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>
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
Nicolas Lœuillet [Sat, 23 Jan 2016 13:30:56 +0000 (14:30 +0100)]
[#1621] Add default address for FosUser
Nicolas Lœuillet [Wed, 20 Jan 2016 16:16:17 +0000 (17:16 +0100)]
SensioLabsInsight fixes
Nicolas Lœuillet [Wed, 20 Jan 2016 15:24:48 +0000 (16:24 +0100)]
[#1604] First draft to fix SensioLabsInsight report
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
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/...`
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
Nicolas Lœuillet [Fri, 22 Jan 2016 10:43:18 +0000 (11:43 +0100)]
Updated version in README
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
Jeremy Benoist [Fri, 22 Jan 2016 07:01:32 +0000 (08:01 +0100)]
CS
Jeremy Benoist [Thu, 21 Jan 2016 17:06:10 +0000 (18:06 +0100)]
Add for deleting rule from an other user
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.
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.
Jeremy Benoist [Thu, 21 Jan 2016 15:36:30 +0000 (16:36 +0100)]
Fix bad redirection when adding a new user
Jeremy Benoist [Thu, 21 Jan 2016 15:36:17 +0000 (16:36 +0100)]
Add tests on TagAllCommand
Some simple tests
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
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
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)
Alexandr Danilov [Tue, 19 Jan 2016 15:22:59 +0000 (18:22 +0300)]
#1490 HTML in E-Mails
Jeremy Benoist [Sun, 10 Jan 2016 12:01:00 +0000 (13:01 +0100)]
CS
Jeremy Benoist [Sun, 10 Jan 2016 11:49:43 +0000 (12:49 +0100)]
Use HTML email for 2FA
Related to #1490
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
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.
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
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
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.
Jeremy Benoist [Wed, 20 Jan 2016 17:35:57 +0000 (18:35 +0100)]
Remove tag relation when removing an entry
Fix #1453
Nicolas Lœuillet [Wed, 20 Jan 2016 13:37:01 +0000 (14:37 +0100)]
[#1590] Add JSON import from wallabag v2
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
Nicolas Lœuillet [Wed, 20 Jan 2016 11:54:19 +0000 (12:54 +0100)]
Add configuration for portuguese documentation
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
araujo0205 [Tue, 19 Jan 2016 18:01:28 +0000 (16:01 -0200)]
Create index.rst
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
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
Jeremy Benoist [Fri, 15 Jan 2016 15:29:06 +0000 (16:29 +0100)]
Merge pull request #1584 from wallabag/v2-cleanup
some cleanup
Nicolas Lœuillet [Fri, 15 Jan 2016 15:07:57 +0000 (16:07 +0100)]
some cleanup:
* move capistrano config files
* remove useless files
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
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
Nicolas Lœuillet [Fri, 15 Jan 2016 14:09:43 +0000 (15:09 +0100)]
remove flattr on about page
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
Jeremy Benoist [Fri, 15 Jan 2016 14:28:22 +0000 (15:28 +0100)]
Fix `findOneByUrl` side effect in tests
Fix #1566
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
Nicolas Lœuillet [Sat, 9 Jan 2016 13:34:49 +0000 (14:34 +0100)]
Quickstart for beginners
Jeremy Benoist [Fri, 15 Jan 2016 10:05:51 +0000 (11:05 +0100)]
Update graby stuff
Jeremy Benoist [Fri, 15 Jan 2016 08:34:09 +0000 (09:34 +0100)]
Update readme & fix console permission
Jeremy Benoist [Fri, 15 Jan 2016 06:55:18 +0000 (07:55 +0100)]
Last deps update
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
Jeremy Benoist [Thu, 14 Jan 2016 17:27:36 +0000 (18:27 +0100)]
Update path in build file
Jeremy Benoist [Thu, 14 Jan 2016 17:23:03 +0000 (18:23 +0100)]
Update to Symfony 3.0.x
Jeremy Benoist [Thu, 14 Jan 2016 17:15:07 +0000 (18:15 +0100)]
Switch to Symfony 3 structure
Jeremy Benoist [Thu, 14 Jan 2016 13:10:33 +0000 (14:10 +0100)]
Remove some commented code
Jeremy Benoist [Thu, 14 Jan 2016 12:46:30 +0000 (13:46 +0100)]
Update to friendsofsymfony/oauth-server-bundle@1.5.0-BETA
Jeremy Benoist [Wed, 13 Jan 2016 21:53:36 +0000 (22:53 +0100)]
Fix Pocket generateUrl parameters
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
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)
Jeremy Benoist [Thu, 31 Dec 2015 17:51:35 +0000 (18:51 +0100)]
TwoFactorBundle -> 2.0
Jeremy Benoist [Tue, 22 Dec 2015 12:09:10 +0000 (13:09 +0100)]
Switch to psr-4
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
Jeremy Benoist [Tue, 22 Dec 2015 09:16:34 +0000 (10:16 +0100)]
Symfony Upgrade Fixer FTW
symfony-upgrade-fixer fix src/Wallabag/