mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-26 09:30:30 +00:00
Code Issues Projects Releases Wiki Activity
2234 commits 13 branches 100 tags 174 MiB
Commit graph

663 commits

Author SHA1 Message Date
Jeremy Benoist
90280df080 Change wording for create a new user 2016-02-23 14:38:42 +01:00
Nicolas Lœuillet
bb17ddea61 changed error message 2016-02-22 22:14:56 +01:00
Jeremy Benoist
b6c00b0b80 Add tests 2016-02-22 13:33:22 +01:00
Nicolas Lœuillet
fe5597c433 Display a human message when graby fails to fetch articles 2016-02-22 13:30:17 +01:00
Jeremy Benoist
e5b5270962 Add translation 2016-02-22 11:44:39 +01:00
Jeremy Benoist
a4f42c59f0 Use internal config instead for demo 2016-02-22 11:44:39 +01:00
Nicolas Lœuillet
d8d56448c9 add a username for demonstration mode 2016-02-22 11:43:29 +01:00
Nicolas Lœuillet
36f20a6570 typo 2016-02-22 11:43:28 +01:00
Nicolas Lœuillet
6c9f50a662 Demonstration mode to prevent password changes 2016-02-22 11:43:28 +01:00
Jeremy Benoist
12b5a8cea1 Merge pull request #1702 from wallabag/v2-piwik 
Added Piwik implementation
 2016-02-22 11:24:41 +01:00
Jeremy Benoist
077ddbe1ae Use a different way to use piwik 2016-02-22 11:11:08 +01:00
Nicolas Lœuillet
0cde91cc6f Merge pull request #1699 from wallabag/v2-assign-tag 
Move assignTagsToEntry in ContentProxy helper
 2016-02-19 21:21:47 +01:00
Maxime LECLERCQ
671a2b887f Fix #1551 - Redirect to the last page when current page is out of range 2016-02-19 16:02:31 +01:00
Nicolas Lœuillet
07643dde08 Fix #1137: implemented Piwik 2016-02-19 15:27:57 +01:00
Jeremy Benoist
c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
Jeremy Benoist
befa6f2fe9 Merge pull request #1696 from wallabag/v2-french-translations-missing 
Add some missing french translations
 2016-02-18 14:44:26 +01:00
Nicolas Lœuillet
04c0737817 Add some missing french translations 2016-02-18 13:59:02 +01:00
Nicolas Lœuillet
fdec3acab1 Merge pull request #1688 from mruminski/patch-1 
Create messages.pl.yml
 2016-02-18 13:16:49 +01:00
mruminski
660d66cabd Update messages.pl.yml 
change ' to ""
 2016-02-18 11:47:35 +01:00
mruminski
1f8f9eaac8 Update messages.pl.yml 
fix some mistakes in translation
 2016-02-18 11:27:11 +01:00
Thomas Citharel
f37c9c3348 translate estimated time minutes 2016-02-18 01:36:02 +01:00
Jeremy Benoist
93d0aa40bb Merge pull request #1689 from mruminski/patch-2 
Create validators.pl.yml
 2016-02-18 00:02:53 +01:00
Jeremy Benoist
db0e34e2ce Merge pull request #1687 from 0wnrepo/v2 
Translated another two files into romanian.
 2016-02-18 00:00:46 +01:00
mruminski
e87638227f Create validators.pl.yml 
Polish translation
 2016-02-17 22:23:51 +01:00
mruminski
75ff0e6e32 Create messages.pl.yml 
Polish translation
 2016-02-17 22:18:30 +01:00
steve
6a88b61cf1 Translated another two files into romanian. 2016-02-17 22:40:26 +02:00
Masoud Abkenar
ebac4090b5 Added Persian (fa) (فارسی) translation 2016-02-17 15:37:29 +01:00
0wnrepo
ab25e399f0 Fix \& 2016-02-17 13:39:23 +02:00
steve
d8f5b27012 Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". 2016-02-17 01:56:51 +02:00
Masoud Abkenar
b7c47a2a86 Create messages.fa.yml 
Translation file for the 'Persian' language. Also recognized by fa_IR. Also known (in the Persian language) as Farsi. Also written like فارسی in Persian. All said, please call the language just 'Persian'.
 2016-02-16 16:38:08 +01:00
Nicolas Lœuillet
f6249b67f6 Merge pull request #1668 from wallabag/v2-stuff 
Few updates
 2016-02-16 12:27:43 +01:00
Jeremy Benoist
9e33bc9dfd Typos 2016-02-16 11:39:24 +01:00
Nicolas Lœuillet
559cd55bc8 Merge pull request #1672 from wallabag/v2-improve-baggy-theme 
improve baggy theme (add new tag panel)
 2016-02-15 19:22:13 +01:00
Thomas Citharel
a8d5f8971e fix typos 2016-02-15 17:04:48 +01:00
Thomas Citharel
56349e470a improve baggy theme (add new tag panel) 2016-02-14 20:12:03 +01:00
Thomas Citharel
e8d8026242 display pictures properly 2016-02-14 19:10:33 +01:00
Jeremy Benoist
daa2b7e7c3 More translations 2016-02-12 16:59:15 +01:00
Jeremy Benoist
cfc90f8422 Merge pull request #1658 from wallabag/v2-import-v1-tags 
import tags from v1 (#1657)
 2016-02-12 15:05:04 +01:00
Thomas Citharel
fca2b05200 import tags from v1 (#1657) 2016-02-12 14:49:41 +01:00
Jeremy Benoist
9856805540 CS 2016-02-12 12:24:30 +01:00
Jeremy Benoist
0c6845a98f Add env=prod for server:run on install 2016-02-12 12:01:02 +01:00
Jeremy Benoist
55da765e11 Add missing translations 2016-02-12 12:00:49 +01:00
Jeremy Benoist
c7a4f74f9f Redirect to the right tab on /config 2016-02-12 12:00:26 +01:00
Jeremy Benoist
7a97c7d06f Merge pull request #1656 from wallabag/v2-fix-new-user-password-prompts 
fix labels on new user prompt
 2016-02-11 18:19:35 +01:00
Thomas Citharel
6fa4be38eb fix labels on new user prompt 
fix tests

nl

add translation validation length
 2016-02-11 17:52:00 +01:00
Jeremy Benoist
06c190887f Merge pull request #1654 from wallabag/fix-add-button-mobile-view 
fix #1636
 2016-02-11 17:15:28 +01:00
Alexandr Danilov
a7c7de4e9b Better design of the close button 2016-02-11 16:51:12 +01:00
Jeremy Benoist
9b5edf33a0 Merge pull request #1663 from wallabag/v2-remove-tags-from-entry 
remove tag from entry #1377
 2016-02-11 16:49:03 +01:00
Jeremy Benoist
5db084e05b Merge pull request #1665 from wallabag/v2-translations 
lots of diverse translation stuff & some typos
 2016-02-11 16:48:46 +01:00
Thomas Citharel
eaf9dad777 add tests 2016-02-11 15:48:20 +01:00
Thomas Citharel
da0a9e01e9 CS 2016-02-11 13:39:21 +01:00
Thomas Citharel
0783c99a19 reimport v1 entries if they were not fetched 2016-02-11 13:27:17 +01:00
Thomas Citharel
3a19060ca0 better translation 2016-02-11 12:39:35 +01:00
Thomas Citharel
4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Thomas Citharel
e686a76d34 improve test and change method name. Also, display number of entries for each tag 2016-02-10 18:40:15 +01:00
Thomas Citharel
567421af50 remove tag from entry #1377 2016-02-10 17:41:28 +01:00
Thomas Citharel
dcb6bd7a9d fix #1636 2016-02-08 21:30:11 +01:00
Jeremy Benoist
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
Nicolas Lœuillet
4c46e2609f an other test for non empty fields 2016-02-05 14:52:35 +01:00
Nicolas Lœuillet
f21a5388f9 add test to check empty fields 2016-02-05 14:39:52 +01:00
Jeremy Benoist
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
Nicolas Lœuillet
a0e6a6eb67 updated fixtures 2016-02-05 14:03:58 +01:00
Nicolas Lœuillet
8f06a8c416 User created via wallabag:install is now a SUPER_ADMIN 👑 2016-02-05 13:55:50 +01:00
Nicolas Lœuillet
de3b19b2ce Test if some keys are missing in v2 import 2016-02-05 13:50:16 +01:00
Nicolas Lœuillet
f898102c85 Exported entries were added twice in export file 2016-02-05 13:35:59 +01:00
Jeremy Benoist
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
Jeremy Benoist
d3f31ec485 CS 2016-02-04 20:31:26 +01:00
Thomas Citharel
f161122412 put the equals bar outside the loop 2016-02-04 20:31:26 +01:00
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
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
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
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
Nicolas Lœuillet
c7eef67291 Fix fos_user 2016-02-01 13:38:33 +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
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
143869525f Merge pull request #1629 from wallabag/fixexportformats 
fix #1620 and introduce new parameters to export
 2016-01-24 18:48:28 +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
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
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
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
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
Jeremy Benoist
7e80861588 Remove tag relation when removing an entry 
Fix #1453
 2016-01-20 18:35:57 +01:00
Nicolas Lœuillet
6785f4aa74 [#1590] Add JSON import from wallabag v2 2016-01-20 14:37: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
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
Nicolas Lœuillet
5c072d2b57 Quickstart for beginners 2016-01-15 15:01:30 +01:00
Jeremy Benoist
c7f622d369 Update readme & fix console permission 2016-01-15 09:36:32 +01:00
Jeremy Benoist
27e475a941 Fix Pocket generateUrl parameters 2016-01-15 09:35:38 +01:00
Jeremy Benoist
1d76102a24 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)
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
5c895a7fd1 Update bundle & stock file 
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
619cc45359 Symfony Upgrade Fixer FTW 
symfony-upgrade-fixer fix src/Wallabag/
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
4aa2997106 Merge pull request #1563 from wallabag/v2-fix-1394 
#1394 Fixed 'mark as read' and 'mark as unread' links
 2016-01-10 10:20:16 +01:00
Nicolas Lœuillet
6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links 2016-01-09 22:20:19 +01:00
Nicolas Lœuillet
da82839bf8 add import link on baggy theme 2016-01-09 20:33:09 +01:00
Jeremy Benoist
39643c6b76 Merge pull request #1493 from wallabag/v2-pocket-import 
v2 – 1st draft for Pocket import via API & Wallabag v1 import
 2016-01-07 22:15:08 +01:00
Nicolas Lœuillet
b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet
10b2411c10 Hide export button if we are not on entries list 2016-01-06 07:47:09 +01:00
Nicolas Lœuillet
d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
Jeremy Benoist
8eedc8cfac Few phpDoc fix 
And some little mistakes
 2016-01-03 11:15:44 +01:00
Jeremy Benoist
c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
Jeremy Benoist
7019c7cf6c Add tagged services for import 
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist
252ebd6071 Rewrote Pocket Import 
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
b4b592a0c0 Fix the way to check for an existing entry 
Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
77a7752a59 Update after previous merge 
PR #1443 was merged into this branch to handle all import type in the same place.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
7ec2897ee0 First test on PocketImport 
Giving ability to define the Client add abitliy to easliy test the import.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
0aa344dc24 Update url & service name 
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
5a4bbcc9a7 Change the way to check for an existing entry 
The repository method return the entry found or false if nothing exists.
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
303768dfe9 - remove importers configuration 
- add check on userId for findOneByURL for entries
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
87f23b005c assign tags to entries and add lastPocketImport attribute to user 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
d51b38ed30 create ImportController to list importers 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
557e549db7 service call 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
ff7b031d57 refactor pocket import 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
10b40f85d6 add docs for Import feature 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
d275bdf4d3 form to upload file 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
8c3c77c1bd create controller to launch import command 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
a1bb1b3c2a userId is now set in parameters 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
56ea1de99b first draft for json import, needed for wallabag v1 migration 2016-01-02 23:24:17 +01:00