Commit Graph

2562 Commits

Author SHA1 Message Date
0783c99a19 reimport v1 entries if they were not fetched 2016-02-11 13:27:17 +01:00
3a19060ca0 better translation 2016-02-11 12:39:35 +01:00
4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
e686a76d34 improve test and change method name. Also, display number of entries for each tag 2016-02-10 18:40:15 +01:00
567421af50 remove tag from entry #1377 2016-02-10 17:41:28 +01:00
dcb6bd7a9d fix #1636 2016-02-08 21:30:11 +01:00
ae5b37ef2e Merge pull request #1651 from wallabag/v2-fix-wllbgv2-import
Test if some keys are missing in v2 import
2016-02-05 15:22:51 +01:00
4c46e2609f an other test for non empty fields 2016-02-05 14:52:35 +01:00
f21a5388f9 add test to check empty fields 2016-02-05 14:39:52 +01:00
565c8efb4f Merge pull request #1650 from wallabag/v2-fix-duplicate-exports
Exported entries were added twice in export file
2016-02-05 14:22:55 +01:00
a0e6a6eb67 updated fixtures 2016-02-05 14:03:58 +01:00
8f06a8c416 User created via wallabag:install is now a SUPER_ADMIN 👑 2016-02-05 13:55:50 +01:00
de3b19b2ce Test if some keys are missing in v2 import 2016-02-05 13:50:16 +01:00
f898102c85 Exported entries were added twice in export file 2016-02-05 13:35:59 +01:00
eb15061d0b Adjust export order
To be the same as on the entry page.
Also, export name doesn't need to be translated.
2016-02-04 20:41:30 +01:00
d3f31ec485 CS 2016-02-04 20:31:26 +01:00
f161122412 put the equals bar outside the loop 2016-02-04 20:31:26 +01:00
3b07d01937 remove old dependancy 2016-02-04 20:31:26 +01:00
3a2ada0be0 fix tests 2016-02-04 20:31:26 +01:00
365a38984e better display for txt 2016-02-04 20:31:26 +01:00
6c08fb68b8 add txt export 2016-02-04 20:30:51 +01:00
27c837dcd1 Merge pull request #1642 from wallabag/v2-escape-preview
Unescape content for Material card
2016-02-04 17:46:02 +01:00
855a4c680f Fix #1643: fix the way to load the HTML template in 2factor auth 2016-02-04 17:29:14 +01:00
e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page
Settings page
2016-02-04 15:59:57 +01:00
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
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
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
c7eef67291 Fix fos_user 2016-02-01 13:38:33 +01:00
48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
07c9b1c98a Fix permission to settings page 2016-01-31 14:48:26 +01:00
1c7d66645b CS 2016-01-31 14:48:26 +01:00
2a58606983 Fix tests 2016-01-31 14:48:26 +01:00
67c99849ae Use alias to get container parameters 2016-01-31 14:48:26 +01:00
d6ba77e888 Create internal setting on install & fixtures 2016-01-31 14:48:26 +01:00
1e3ed71470 Add warning message for PocketImport
Warn user if pocket_consumer_key isn't defined
2016-01-31 14:48:26 +01:00
63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
26975877d7 Always include warning message
We'll remove it later, on the stable release
2016-01-31 14:37:19 +01:00
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
143869525f Merge pull request #1629 from wallabag/fixexportformats
fix #1620 and introduce new parameters to export
2016-01-24 18:48:28 +01:00
b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +01:00
f47101e0c4 Add Turkish translation
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
2016-01-24 17:27:26 +02:00
5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
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
23afdf3a70 CS 2016-01-22 08:01:32 +01:00
a3cac44c78 Add for deleting rule from an other user 2016-01-22 08:01:17 +01:00
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
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
e56983af1f Fix bad redirection when adding a new user 2016-01-21 16:36:30 +01:00