Thomas Citharel
3b07d01937
remove old dependancy
2016-02-04 20:31:26 +01:00
Thomas Citharel
3a2ada0be0
fix tests
2016-02-04 20:31:26 +01:00
Thomas Citharel
365a38984e
better display for txt
2016-02-04 20:31:26 +01:00
Thomas Citharel
6c08fb68b8
add txt export
2016-02-04 20:30:51 +01:00
Jeremy Benoist
27c837dcd1
Merge pull request #1642 from wallabag/v2-escape-preview
...
Unescape content for Material card
2016-02-04 17:46:02 +01:00
Jeremy Benoist
2ab20ed6f9
Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter
...
Fix #1622 : parameter for FosUser confirmation
2016-02-04 17:45:50 +01:00
Jeremy Benoist
eb3e3969a2
Merge pull request #1645 from wallabag/v2-fix-loadtemplate-sendemail
...
Fix #1643 : fix the way to load the HTML template in 2factor auth
2016-02-04 17:45:26 +01:00
Nicolas Lœuillet
855a4c680f
Fix #1643 : fix the way to load the HTML template in 2factor auth
2016-02-04 17:29:14 +01:00
Nicolas Lœuillet
bc358c9180
CS
2016-02-04 16:06:05 +01:00
Nicolas Lœuillet
3eb06f2891
Fix #1622 : parameter for FosUser confirmation
2016-02-04 16:00:45 +01:00
Nicolas Lœuillet
e008c037f5
Merge pull request #1612 from wallabag/v2-settings-page
...
Settings page
2016-02-04 15:59:57 +01:00
Jeremy Benoist
0796532460
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.
2016-02-03 20:45:15 +01:00
Jeremy Benoist
74f39b0952
Merge pull request #1641 from wallabag/v2-doc-typo
...
Update import.rst to fix a doc typo
2016-02-01 14:25:22 +01:00
Nicolas Lœuillet
f4243aa75f
Update import.rst
2016-02-01 14:22:19 +01:00
Jeremy Benoist
85ad629a3c
Merge pull request #1601 from wallabag/v2-import-from-v2
...
[#1590 ] Add JSON import from wallabag v2
2016-02-01 14:17:20 +01:00
Jeremy Benoist
e43d27f845
Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
...
[#1604 ] First draft to fix SensioLabsInsight report
2016-02-01 13:51:35 +01:00
Jeremy Benoist
74d8afa5fa
Merge pull request #1639 from wallabag/v2-change-test-dbname
...
Fix #1635 : change database name for test environments (mysql/pgsql)
2016-02-01 13:46:32 +01:00
Jeremy Benoist
79b9e49d94
Fix Shaarli url traduction
2016-02-01 13:42:27 +01:00
Nicolas Lœuillet
c7eef67291
Fix fos_user
2016-02-01 13:38:33 +01:00
Nicolas Lœuillet
61c640ed31
Fix #1635 : change database name for test environments (mysql/pgsql)
2016-02-01 13:22:34 +01:00
Jeremy Benoist
48e3007b7f
Fix from_email & fos_user
2016-01-31 15:31:34 +01:00
Jeremy Benoist
a74a6ca2b1
Add new export config
2016-01-31 15:31:30 +01:00
Jeremy Benoist
07c9b1c98a
Fix permission to settings page
2016-01-31 14:48:26 +01:00
Jeremy Benoist
1c7d66645b
CS
2016-01-31 14:48:26 +01:00
Jeremy Benoist
2a58606983
Fix tests
2016-01-31 14:48:26 +01:00
Jeremy Benoist
67c99849ae
Use alias to get container parameters
2016-01-31 14:48:26 +01:00
Jeremy Benoist
d6ba77e888
Create internal setting on install & fixtures
2016-01-31 14:48:26 +01:00
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
5f8a785719
SensioLabsInsight fixes
2016-01-22 21:12:11 +01:00
Nicolas Lœuillet
b0b893eafd
[ #1604 ] First draft to fix SensioLabsInsight report
2016-01-22 21:12:11 +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
