mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-05 16:39:49 +00:00
Code Issues Projects Releases Wiki Activity
3364 commits 11 branches 100 tags 165 MiB
Commit graph

1217 commits

Author SHA1 Message Date
Nicolas Lœuillet
73e8df9e44
Renamed variable for page title 2016-10-26 15:49:44 +02:00
Nicolas Lœuillet
7a5043f187
Added tag label in the page title 
Fix #2472
 2016-10-26 13:53:23 +02:00
Jeremy Benoist
c68720d40e Merge pull request #2473 from pmichelazzo/master 
Portuguese (Brazilian) translation
 2016-10-25 11:41:24 +02:00
Paulino Michelazzo
e8eec07ae6 Translated missed line 147 2016-10-25 07:25:08 -02:00
Nicolas Lœuillet
23406ca3f1
Added relation between API Client and User 
Fix #2062
 2016-10-24 21:56:28 +02:00
Mateusz Rumiński
cd99bfae68 Update messages.pl.yml 
translate reset section to polish
 2016-10-24 19:49:33 +02:00
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
9313ea9d44 Merge pull request #2401 from wallabag/reset-account 
Reset account
 2016-10-24 11:57:51 +02:00
Jeremy Benoist
5ce1528953
Fix migrations 2016-10-23 12:35:57 +02:00
Jeremy Benoist
88d5d94dcb
Lowercase wallabag 2016-10-22 14:05:59 +02:00
Jeremy Benoist
fc79f1ffa8
Add verification check for MySQL version 
Must now be >= 5.5.4
 2016-10-22 13:41:03 +02:00
Jeremy Benoist
b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist
8c61fd12b1
CS 2016-10-22 13:13:07 +02:00
Jeremy Benoist
ca8b49f46e
Add baggy reset part 2016-10-22 13:13:07 +02:00
Jeremy Benoist
f71e55ac88
Avoid orphan tags 2016-10-22 13:13:07 +02:00
Jeremy Benoist
2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist
191564b7f7
Add custom doctrine subscriber for SQLite 
Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.

Also some refacto
 2016-10-22 13:13:07 +02:00
Jeremy Benoist
98efffc2a6
Fix emoji insertion in MySQL 
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
 2016-10-22 13:13:07 +02:00
Jeremy Benoist
206bade58a
Add ability to reset some datas 
- annotations
- tags
- entries
 2016-10-22 13:13:06 +02:00
Jeremy Benoist
817724a7b8
Re-add bottom pagination 
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
 2016-10-22 13:09:16 +02:00
Thomas Citharel
34aa06a9b9
WIP 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-22 13:08:04 +02:00
Jeremy Benoist
aa4741091f
Add test on /api/annotations 
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
 2016-10-22 12:09:20 +02:00
Jeremy Benoist
3199ec4702
CS 2016-10-22 09:17:01 +02:00
Nicolas Lœuillet
d9b7768dca
Added a missing namespace 2016-10-22 09:06:07 +02:00
Thomas Citharel
0c271b9eb0
fix cs and phpdoc 2016-10-22 09:06:07 +02:00
Thomas Citharel
b1e92f8c14
cs 2016-10-22 09:06:07 +02:00
Thomas Citharel
1eea248bb0
move code 2016-10-22 09:06:07 +02:00
Thomas Citharel
c7935f32d2
cs 2016-10-22 09:06:07 +02:00
Thomas Citharel
351eb8d97e
bring annotations to API 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes 
Some fixes
 2016-10-21 15:15:41 +02:00
Jeremy Benoist
b64d8f2c9f
Update Twitter cards description 2016-10-21 10:51:20 +02:00
Jeremy Benoist
2cbf0d05d4
Update translation for piwik_host 2016-10-21 10:45:39 +02:00
Jeremy Benoist
645dc7594b
Fix missing translations 2016-10-21 07:52:55 +02:00
Jeremy Benoist
818cbe1fee
Fix Portuguese translation 2016-10-21 07:18:41 +02:00
Paulino Michelazzo
8e53bf3aa1 Update translation 2016-10-21 00:12:53 +02:00
Jeremy Benoist
2297d60f10
If reload content failed, don’t update it 
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
 2016-10-20 22:49:46 +02:00
Jeremy Benoist
5453500458
Requeue depending on producer 
Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
 2016-10-20 21:17:45 +02:00
Jeremy Benoist
1e3d74a9cf
Avoid RabbitMQ consumer to loop 
When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
 2016-10-20 21:17:03 +02:00
Jeremy Benoist
576d285ddf
Translate date 
I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
 2016-10-20 21:16:01 +02:00
Jeremy Benoist
166e8cc6a9
Fix french translation 2016-10-20 21:14:46 +02:00
Jeremy Benoist
1cad9416c9
Update Portuguese translations 2016-10-20 21:11:10 +02:00
Paulino Michelazzo
a42cc6ff89 Update validators.pt.yml file 
Some missed strings translated.
 2016-10-20 08:57:24 +02:00
Paulino Michelazzo
99731f0bb1 Merge remote-tracking branch 'wallabag/master' 2016-10-18 22:48:23 +02:00
Paulino Michelazzo
3a3c6b866b Portuguese (Brazilian) translation 
This the Portuguese (Brazilian) for the Wallaby v2.
 2016-10-18 20:51:31 +02:00
Jeremy Benoist
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs 
Fix tabs on material
 2016-10-16 21:06:23 +02:00
Jeremy Benoist
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width 
Fix baggy display on small screens
 2016-10-16 21:05:30 +02:00
Thomas Citharel
97512ec4bc Merge pull request #2459 from wallabag/improve-german-translation 
German: improve existing and add missing translation
 2016-10-16 12:06:42 +02:00
Sven Fischer
5bd7acd50d German: improve existing and add missing translation 2016-10-16 10:45:51 +02:00
Sven Fischer
f69ab83a5a add link to German documentation in about page 2016-10-16 09:23:58 +02:00
Thomas Citharel
d9a30ef301 Fix tabs on material 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-15 19:26:38 +02:00
Thomas Citharel
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Jeremy Benoist
5960aa1ffc
CS 2016-10-15 18:00:08 +02:00
Jeremy Benoist
f1c3f68e90
ApiDoc & Route annotation were conflicted 
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
 2016-10-15 16:46:42 +02:00
Alexandr Danilov
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Mateusz Rumiński
fa100dd1e0 Update messages.pl.yml 
translate delete section to polish
 2016-10-12 19:32:30 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub 
API: ability to export entry in all available format (epub, pdf, etc...)
 2016-10-12 14:06:33 +02:00
Jeremy Benoist
e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Jeremy Benoist
e57df5611f Merge pull request #2409 from wallabag/Quent-in-patch-1 
Occitan version update
 2016-10-11 18:18:29 +02:00
Quent-in
a9e4d6dad2 Update messages.oc.yml 
I thought I had translated the Docker installation line, apparently not!
Thanks Nicolas for the other changes!
 2016-10-10 20:01:25 +02:00
Nicolas Lœuillet
a2f42d8eaa
Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
Nicolas Lœuillet
020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
Nicolas Lœuillet
c26d1285ba Fixed review 2016-10-10 10:05:50 +02:00
Nicolas Lœuillet
2a5ff7f554 Merge pull request #2411 from wallabag/fix-entities 
Fix entities definition
 2016-10-10 08:02:25 +02:00
Jeremy Benoist
8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet 
Remove automatic closing of the window from bookmarklet
 2016-10-10 07:11:01 +02:00
Krzysztof Szafranek
d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
Jeremy Benoist
39a19bdf47
When a sub command fail, display error message 
We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”.

Using the `BufferedOutput` we can store the output and only display it if an error occurs.
 2016-10-09 22:39:43 +02:00
Jeremy Benoist
8dc4cd0f25
Fix entities definition 
As per Doctrine said in the debug tool bar:

- The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute.

- The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.
 2016-10-09 20:51:37 +02:00
Jeremy Benoist
28bb48905a
Optimize the way tag list is rendered 
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
 2016-10-09 18:55:22 +02:00
Jeremy Benoist
b4fcd60e7f
Avoid tag duplication when tagging all articles 
Mostly when the tag doesn’t yet exist.
It was created each time it matche the rule… glups.
 2016-10-09 18:55:21 +02:00
Jeremy Benoist
4d318f3755
Add more log to tag:all 2016-10-09 18:55:21 +02:00
Quent-in
dd248e4561 Occitan version update 
If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php
It comes with lots of languages ;)
Q: where are the "previous" and "next" bouton text? Can't find them to translate them.
 2016-10-09 18:24:42 +02:00
Jeremy Benoist
e39aec3e38 Merge pull request #2406 from szafranek/bugfix-number-of-annotations 
Show number of annotations instead of nbAnnotations placeholder
 2016-10-09 14:11:20 +02:00
Krzysztof Szafranek
90c766b96b Show number of annotations instead of nbAnnotations placeholder 
When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.
 2016-10-09 04:59:04 +02:00
Krzysztof Szafranek
c5e4293efd Fix few invalid HTML tags 2016-10-09 03:37:21 +02:00
Jeremy Benoist
9810f30821
Remove unnecessary user serialization 2016-10-08 21:16:40 +02:00
Jeremy Benoist
7ac3e575f1
CS 2016-10-08 20:35:16 +02:00
Jeremy Benoist
a730cae384
Bonus: display driver in install command 2016-10-08 20:33:21 +02:00
Jeremy Benoist
3f60446756
Fix PostgreSQL query 
PostgreSQL doesn’t like when we compare interger and boolean :)
 2016-10-08 20:26:06 +02:00
Jeremy Benoist
876d77a67d
Better display and description 
Confirmation message isn’t required since it is written in the delete description
 2016-10-08 20:25:42 +02:00
Jeremy Benoist
eed812afd0
Logout user before deleting it 
And add a smal description
 2016-10-08 19:39:12 +02:00
Nicolas Lœuillet
93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion 
Changed relation between API client and refresh token
 2016-10-08 13:31:54 +02:00
Nicolas Lœuillet
4ad6f5878a Merge pull request #2393 from wallabag/api-urls-exist 
Ability to check multiple urls in API
 2016-10-08 13:31:31 +02:00
Nicolas Lœuillet
71254701b7
Changed tests 2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
bb0c78f4a6
Added check if there is only one user 
Added translations and documentation
 2016-10-08 13:27:18 +02:00
Thomas Citharel
abb5291cd5
CS 2016-10-08 13:27:17 +02:00
Thomas Citharel
e4b46f77ef
work 2016-10-08 13:27:17 +02:00
Jeremy Benoist
3f3a60879e
Add entry export in API 
Export isn't available for json & xml because user can use the default
entry endpoint instead.
 2016-10-08 12:59:19 +02:00
Pascal MARTIN
24de866534
API: getEntry can return EPUB 2016-10-08 12:05:41 +02:00
Pascal MARTIN
3d4b0b3064
Routing: epub format is allowed for API 2016-10-08 12:05:40 +02:00
Jeremy Benoist
ee32248f43
Ensure access_token are removed 
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
 2016-10-08 00:05:41 +02:00
Jeremy Benoist
ac8cf632bb
Ensure orphan tag are remove in API 
When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it.

Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)
 2016-10-07 23:31:53 +02:00
Nicolas Lœuillet
3049afe190 Merge pull request #2396 from wallabag/mruminski-patch-1 
Update messages.pl.yml
 2016-10-07 22:20:51 +02:00
Mateusz Rumiński
aa8a58b5a0 Update messages.pl.yml 
translated shared_by_wallabag to polish
 2016-10-07 21:32:27 +02:00
Jeremy Benoist
6d204f5382
Add ability to use socket 
For Redis & MySQL
 2016-10-07 21:00:13 +02:00
Jeremy Benoist
f0abc22d09
Ability to check multiple urls in API 2016-10-07 20:37:01 +02:00
Nicolas Lœuillet
20bf78b935 Merge pull request #2389 from wallabag/add-info-publich-articles 
Added default picture if preview picture is null
 2016-10-07 16:35:32 +02:00
Nicolas Lœuillet
d5c45d5288
Added default picture if preview picture is null 2016-10-07 15:21:31 +02:00
Nicolas Lœuillet
5e7786f3c4
Fixed two-factor checkbox display in user admin panel 
Fix #2380
 2016-10-07 14:56:26 +02:00
Nicolas Lœuillet
c8d2dcdafe Merge pull request #2383 from wallabag/add-info-publich-articles 
Added OpenGraph support for public articles
 2016-10-07 14:30:46 +02:00
Nicolas Lœuillet
d0d196ffb3
Fixed review 2016-10-07 09:22:40 +02:00
Nicolas Lœuillet
f0d52417fb
Added OpenGraph support for public articles 
Fix #2289
 2016-10-07 09:05:18 +02:00
Jeremy Benoist
74e1f7433a
Fix tag test 2016-10-07 07:43:48 +02:00
Jeremy Benoist
6c8806cadc
Fix bad translation key 
`entry_reload_failed` instead of `entry_reloaded_failed`
 2016-10-07 07:43:48 +02:00
Jeremy Benoist
b0458874c8
Fix relations export for Entry 
Tags & Annotations weren’t really well exported.
This is now fixed (+ tests)
 2016-10-07 07:43:19 +02:00
Thomas Citharel
9d127b3b93 Merge pull request #2377 from wallabag/fix-exists-api 
Fix exists API call
 2016-10-05 19:52:06 +02:00
Jeremy Benoist
0b174d69d7
Fix typo & add test 2016-10-05 19:30:56 +02:00
Thomas Citharel
5d39243068 Fix exists API call 
Boo
 2016-10-05 15:28:36 +02:00
Thomas Citharel
15f1352ef8
better tags on material 2016-10-05 14:06:55 +02:00
Thomas Citharel
645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00
Thomas Citharel
57386125ab Merge pull request #2353 from wallabag/assets-fix 
Basically, fix everything
 2016-10-04 16:26:50 +02:00
Thomas Citharel
f733d8aaa3
Fix icon position 2016-10-04 15:12:48 +02:00
Nicolas Lœuillet
3e85e91159
Fixed calendar icon position with baggy theme 2016-10-04 15:00:47 +02:00
Nicolas Lœuillet
0c7f1ba796
Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel
46d78f87d9
fix icons 2016-10-04 14:48:22 +02:00
Jeremy Benoist
755ff9e835
Create config even if user is disabled 
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event.
There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
 2016-10-04 10:42:46 +02:00
Thomas Citharel
a494c33ef7
Basically, fix everything 
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
 2016-10-03 23:08:26 +02:00
Nicolas Lœuillet
b0da721a52
Changed relation between API client and refresh token 
Fix #2350
 2016-10-03 21:39:01 +02:00
Thomas Citharel
aafb3321b7 Merge pull request #2341 from mruminski/master 
Update messages.pl.yml
 2016-10-03 16:44:19 +02:00
Sven Fischer
1c634fe437 improve German translation 2016-10-03 15:52:27 +02:00
Mateusz Rumiński
0113e2af1f Update messages.pl.yml 
add missing and update existing translation
 2016-10-03 15:05:21 +02:00
Nicolas Lœuillet
0f70abd695
Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Jeremy Benoist
7d002c333d Merge pull request #2333 from wallabag/translation-german-for-2.1 
for 2.1, translate all strings to German, which haven't been translated yet
 2016-10-03 09:25:51 +02:00
Nicolas Lœuillet
ab809de184 Merge pull request #2314 from wallabag/assets 
Assets work
 2016-10-03 09:09:45 +02:00
Jeremy Benoist
c30af946e7 Update messages.de.yml 2016-10-03 09:08:42 +02:00
Nicolas Lœuillet
553f863c3c Fixed typos 2016-10-03 09:05:40 +02:00
Julian Oster
beee26f6d5 Better translation for the weird sentence 2016-10-02 22:50:27 +02:00
Julian Oster
a878581410 Improve the german translation a bit 
Just some little mistakes, good work so far :)
 2016-10-02 22:32:23 +02:00
Sven Fischer
df9c080f8c translate all strings to German, which haven't been translated yet 2016-10-02 21:41:21 +02:00
Thomas Citharel
dfbbf0e18a Merge pull request #2331 from wallabag/api-links 
Fix parameters in API _links
 2016-10-02 17:48:16 +02:00
Jeremy Benoist
77557d289b
Merge remote-tracking branch 'origin/master' into 2.1 2016-10-02 17:37:41 +02:00
Jeremy Benoist
c3f8b428dd
Fix parameters in API _links 
We forgot to pass them to the factory
 2016-10-02 15:41:08 +02:00
Jeremy Benoist
1dc3bee6b9 Merge pull request #2327 from wallabag/user-management 
Add users management UI
 2016-10-02 15:00:02 +02:00
Jeremy Benoist
ccc7faec09
Disabled delete button for the logged user 
To avoid some bad things to happen…
 2016-10-02 13:29:57 +02:00
Nicolas Lœuillet
18b8dc0e99 Merge pull request #2325 from wallabag/api-entries-exists 
Add an exists endpoint in API
 2016-10-02 13:17:23 +02:00
Paulino Michelazzo
ffcd91ec6c Remove error message when creating ePub versions 
Trying to create a ePub version, the first page shows a message of a
“missing >”. This change solve this problem (and, for sure, in any
download version that’s use HTML).
 2016-10-02 13:16:12 +02:00
Nicolas Lœuillet
92395680b6 Merge pull request #2328 from wallabag/avoid-duplicate-url 
Avoid duplicate url with accents
 2016-10-02 13:14:16 +02:00
Jeremy Benoist
03141f9b95
Cleanup & add link on baggy menu 2016-10-02 11:08:53 +02:00
Jeremy Benoist
152fcccd44
Add users management UI 
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
 2016-10-02 11:08:53 +02:00
Jeremy Benoist
52c1fc7449 Merge pull request #2326 from wallabag/update-quickstart 
Changed quickstart layout
 2016-10-02 11:06:03 +02:00
Jeremy Benoist
6e5e27ab07 Merge pull request #2324 from wallabag/edit-tagging-rule 
Add ability to edit a tagging rule
 2016-10-02 11:05:10 +02:00
Jeremy Benoist
bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Jeremy Benoist
a4df48916d
Fix OC typos 
+ remove extra sentence
 2016-10-02 09:57:48 +02:00
Jeremy Benoist
3583cadf6f
CS 2016-10-02 01:43:50 +02:00
Quent-in
1bcfeb0f4a Occitan version update 
to be ready for the future of Wallabag :)
 2016-10-01 18:23:37 +02:00
Nicolas Lœuillet
0d61b6015f
Fixed french translation 2016-10-01 18:15:59 +02:00
Jeremy Benoist
2455472e26
CS 2016-10-01 18:05:25 +02:00
Jeremy Benoist
19ca0b2f35
Avoid duplicate url with accents 2016-10-01 18:00:11 +02:00
Nicolas Lœuillet
7d72cce4c7
Changed translations 2016-10-01 17:29:04 +02:00
Jeremy Benoist
8799bde00d
Introduce validateRuleAction 2016-10-01 17:24:24 +02:00
Jeremy Benoist
6273fefd5d
Add an exists endpoint in API 
It should allow third party to check if an url was already saved by a user
 2016-10-01 17:15:28 +02:00