Jeremy Benoist
278b221e65
We don't need migration yet
2016-01-31 14:48:26 +01:00
Jeremy Benoist
1e3ed71470
Add warning message for PocketImport
...
Warn user if pocket_consumer_key isn't defined
2016-01-31 14:48:26 +01:00
Jeremy Benoist
63e40f2d7c
Add CraueConfig for internal settings
2016-01-31 14:48:26 +01:00
Jeremy Benoist
26975877d7
Always include warning message
...
We'll remove it later, on the stable release
2016-01-31 14:37:19 +01:00
Jeremy Benoist
bc78968764
Move default configuration out of parameters
...
These default configuration value shouldn't be in parameters.yml.
2016-01-31 14:37:19 +01:00
Nicolas Lœuillet
feb02cb709
Merge pull request #1630 from wallabag/v2-add-gitter-badge
...
Add @GitterHQ badge on README
2016-01-24 20:02:43 +01:00
Nicolas Lœuillet
51d8343954
Add @GitterHQ badge on README
2016-01-24 20:02:31 +01:00
Nicolas Lœuillet
143869525f
Merge pull request #1629 from wallabag/fixexportformats
...
fix #1620 and introduce new parameters to export
2016-01-24 18:48:28 +01:00
Nicolas Lœuillet
2532f72c59
Merge pull request #1628 from ogunkarakus/v2-turkish-translation
...
Add Turkish translation
2016-01-24 18:44:58 +01:00
Thomas Citharel
b89444ad8b
fix #1620 and introduce new parameters to export
2016-01-24 18:21:09 +01:00
Ogün Karakuş
f47101e0c4
Add Turkish translation
...
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
2016-01-24 17:27:26 +02:00
Jeremy Benoist
95780f5abe
Merge pull request #1625 from wallabag/v2-fix-1621
...
[#1621 ] Add default address for FosUser
2016-01-23 20:29:32 +01:00
Nicolas Lœuillet
a40dd9896b
[ #1621 ] Add default address for FosUser
2016-01-23 14:30:56 +01:00
Nicolas Lœuillet
96fcb60c33
Merge pull request #1619 from wallabag/v2-themes-folder
...
Move public assets for themes
2016-01-22 20:54:17 +01:00
Jeremy Benoist
30d81a47c6
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/...`
2016-01-22 13:45:14 +01:00
Jeremy Benoist
124f8091cb
Merge pull request #1618 from wallabag/v2-readme
...
Updated version in README
2016-01-22 11:46:38 +01:00
Nicolas Lœuillet
06657cb73c
Updated version in README
2016-01-22 11:45:43 +01:00
Nicolas Lœuillet
6c32aaae95
Merge pull request #1614 from wallabag/v2-few-fixes
...
Few fixes
2016-01-22 09:36:50 +01:00
Jeremy Benoist
23afdf3a70
CS
2016-01-22 08:01:32 +01:00
Jeremy Benoist
a3cac44c78
Add for deleting rule from an other user
2016-01-22 08:01:17 +01:00
Jeremy Benoist
0f0e8eb82a
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.
2016-01-21 16:39:13 +01:00
Jeremy Benoist
a0d6ccc5ca
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.
2016-01-21 16:37:25 +01:00
Jeremy Benoist
e56983af1f
Fix bad redirection when adding a new user
2016-01-21 16:36:30 +01:00
Jeremy Benoist
27ea492cf7
Add tests on TagAllCommand
...
Some simple tests
2016-01-21 16:36:17 +01:00
Jeremy Benoist
7a0e6970b4
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
2016-01-21 16:35:41 +01:00
Nicolas Lœuillet
9aa66d6244
Merge pull request #1565 from wallabag/v2-2fa-html
...
Use HTML email for 2FA
2016-01-21 12:27:47 +01:00
Jeremy Benoist
abd454c456
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)
2016-01-21 11:03:27 +01:00
Alexandr Danilov
5f736213af
#1490 HTML in E-Mails
2016-01-21 11:03:27 +01:00
Jeremy Benoist
d1f1333f48
CS
2016-01-21 11:03:27 +01:00
Jeremy Benoist
7ce895bf5e
Use HTML email for 2FA
...
Related to #1490
2016-01-21 11:03:27 +01:00
Nicolas Lœuillet
e72a943ad2
Merge pull request #1610 from wallabag/v2-composer-lock-release
...
Disable xdebug all the time
2016-01-21 11:02:18 +01:00
Jeremy Benoist
3ee1582e60
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.
2016-01-21 09:29:14 +01:00
Nicolas Lœuillet
eff6a406f3
Merge pull request #1606 from wallabag/v2-tag-cascade
...
Remove tag relation when removing an entry
2016-01-21 08:38:37 +01:00
Nicolas Lœuillet
ff1c7d16be
Merge pull request #1607 from wallabag/v2-composer-lock
...
Ignore composer.lock
2016-01-21 08:28:52 +01:00
Jeremy Benoist
173629a400
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.
2016-01-20 18:49:45 +01:00
Jeremy Benoist
7e80861588
Remove tag relation when removing an entry
...
Fix #1453
2016-01-20 18:35:57 +01:00
Nicolas Lœuillet
d481f42b7d
Merge pull request #1599 from wallabag/v2-fix-pt-documentation
...
Add configuration for portuguese documentation
2016-01-20 13:00:43 +01:00
Nicolas Lœuillet
acc0160c29
Add configuration for portuguese documentation
2016-01-20 12:54:19 +01:00
Nicolas Lœuillet
3a59d13fd1
Merge pull request #1594 from araujo0205/patch-1
...
Create index.rst
2016-01-20 12:09:18 +01:00
araujo0205
e1101bee83
Create index.rst
2016-01-19 16:01:28 -02:00
Nicolas Lœuillet
3080a4afa4
Merge pull request #1587 from wallabag/v2-translator
...
Use translator interface instead of final class
2016-01-18 09:16:01 +01:00
Jeremy Benoist
e678c4752a
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
2016-01-17 12:56:04 +01:00
Jeremy Benoist
3bcc4d4cb2
Merge pull request #1584 from wallabag/v2-cleanup
...
some cleanup
2016-01-15 16:29:06 +01:00
Nicolas Lœuillet
160e2d8f0b
some cleanup:
...
* move capistrano config files
* remove useless files
2016-01-15 16:07:57 +01:00
Jeremy Benoist
f902d78153
Merge pull request #1564 from wallabag/v2-remove-flattr
...
Remove Flattr references
2016-01-15 16:01:13 +01:00
Nicolas Lœuillet
86719c63bf
Merge pull request #1583 from wallabag/v2-fix-delete
...
Fix `findOneByUrl` side effect in tests
2016-01-15 15:47:13 +01:00
Nicolas Lœuillet
b91465c067
remove flattr on about page
2016-01-15 15:46:46 +01:00
Nicolas Lœuillet
1930c19d82
Merge pull request #1524 from wallabag/sf2.8
...
Upgrade to Symfony 3.0
2016-01-15 15:38:31 +01:00
Jeremy Benoist
7883367246
Fix findOneByUrl
side effect in tests
...
Fix #1566
2016-01-15 15:28:32 +01:00
Jeremy Benoist
790573d458
Merge pull request #1560 from wallabag/v2-quickstart
...
Fix #1501 Quickstart for beginners
2016-01-15 15:21:43 +01:00