]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
6 years agoMerge remote-tracking branch 'origin/master' into 2.3
Jeremy Benoist [Tue, 22 Aug 2017 09:22:47 +0000 (11:22 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.3

6 years agoMerge pull request #3326 from nclsHart/reload-entry-command
Jérémy Benoist [Tue, 22 Aug 2017 09:21:04 +0000 (11:21 +0200)] 
Merge pull request #3326 from nclsHart/reload-entry-command

Add reload entry command

6 years agorename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId 3326/head
Nicolas Hart [Tue, 22 Aug 2017 08:42:54 +0000 (10:42 +0200)] 
rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId

6 years agorename getAllEntriesId into findAllEntriesIdByUserId
Nicolas Hart [Mon, 21 Aug 2017 16:19:42 +0000 (18:19 +0200)] 
rename getAllEntriesId into findAllEntriesIdByUserId

6 years agoAdd reload entry command
Nicolas Hart [Mon, 21 Aug 2017 08:36:56 +0000 (10:36 +0200)] 
Add reload entry command

6 years agoMerge pull request #3323 from egilli/fix-export-link-with-baggy
Jérémy Benoist [Mon, 14 Aug 2017 15:45:16 +0000 (17:45 +0200)] 
Merge pull request #3323 from egilli/fix-export-link-with-baggy

Fix export links in baggy theme

6 years agoFix export links in baggy theme 3323/head
Étienne Gilli [Mon, 7 Aug 2017 12:14:53 +0000 (14:14 +0200)] 
Fix export links in baggy theme

6 years agoMerge pull request #3322 from braco/patch-1
Jérémy Benoist [Sat, 12 Aug 2017 07:32:51 +0000 (09:32 +0200)] 
Merge pull request #3322 from braco/patch-1

Update Readme with crucial information

6 years agoUpdate Readme with crucial information 3322/head
braco [Thu, 10 Aug 2017 18:54:58 +0000 (14:54 -0400)] 
Update Readme with crucial information

6 years agoMerge pull request #3319 from Quent-in/2.3
Jérémy Benoist [Thu, 10 Aug 2017 08:13:09 +0000 (10:13 +0200)] 
Merge pull request #3319 from Quent-in/2.3

Translation : OC small changes

6 years agoSmall change 3319/head
Quent-in [Wed, 9 Aug 2017 16:40:19 +0000 (18:40 +0200)] 
Small change

Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.

6 years agoMerge pull request #3314 from nclsHart/fix-3313
Jérémy Benoist [Tue, 8 Aug 2017 17:48:47 +0000 (19:48 +0200)] 
Merge pull request #3314 from nclsHart/fix-3313

Reduce number of queries on tag list

6 years agoMerge pull request #3317 from wallabag/mruminski-patch-1
Jérémy Benoist [Tue, 8 Aug 2017 17:38:43 +0000 (19:38 +0200)] 
Merge pull request #3317 from wallabag/mruminski-patch-1

Update messages.pl.yml

6 years agoUpdate messages.pl.yml 3317/head
Mateusz Rumiński [Tue, 8 Aug 2017 13:45:44 +0000 (15:45 +0200)] 
Update messages.pl.yml

add polish translation for credentials

6 years agoReduce number of queries on tag list 3314/head
Nicolas Hart [Sun, 6 Aug 2017 19:58:14 +0000 (21:58 +0200)] 
Reduce number of queries on tag list

6 years agoMerge pull request #3312 from Quent-in/2.3
Jérémy Benoist [Sun, 6 Aug 2017 13:39:04 +0000 (15:39 +0200)] 
Merge pull request #3312 from Quent-in/2.3

Occitan language updates

6 years agoCorrection apostrophe encadrée par simples apostrophes 3312/head
Quent-in [Sat, 5 Aug 2017 18:20:18 +0000 (20:20 +0200)] 
Correction apostrophe encadrée par simples apostrophes

6 years agoCorrection indent. L538
Quent-in [Sat, 5 Aug 2017 17:48:45 +0000 (19:48 +0200)] 
Correction indent. L538

Correction indentation suite rapport Travis

6 years agoMerge pull request #3311 from nclsHart/makefile-webpack
Jérémy Benoist [Sat, 5 Aug 2017 17:19:09 +0000 (19:19 +0200)] 
Merge pull request #3311 from nclsHart/makefile-webpack

Fix make build by replacing grunt with webpack

6 years agoUpdate
Quent-in [Sat, 5 Aug 2017 13:19:34 +0000 (15:19 +0200)] 
Update

2FA : choix des occitanophones interrogés : autentificacion en dos temps.
+ fautes de frappes

6 years agoUpdate OC: correction fautes de frappe
Quent-in [Sat, 5 Aug 2017 13:14:34 +0000 (15:14 +0200)] 
Update OC: correction fautes de frappe

6 years agoUpdate with new strings
Quent-in [Sat, 5 Aug 2017 12:58:15 +0000 (14:58 +0200)] 
Update with new strings

L538 : not quite sure about the number of space.

6 years agoUpdate registration using API
Quent-in [Sat, 5 Aug 2017 12:46:33 +0000 (14:46 +0200)] 
Update registration using API

6 years agoFix make build by replacing grunt with webpack 3311/head
Nicolas Hart [Fri, 4 Aug 2017 22:13:55 +0000 (00:13 +0200)] 
Fix make build by replacing grunt with webpack

6 years agoMerge pull request #3301 from nclsHart/list-user-command
Jérémy Benoist [Wed, 2 Aug 2017 05:25:02 +0000 (07:25 +0200)] 
Merge pull request #3301 from nclsHart/list-user-command

Add list users command

6 years agoadd search argument and limit option to list users command 3301/head
Nicolas Hart [Mon, 31 Jul 2017 21:20:41 +0000 (23:20 +0200)] 
add search argument and limit option to list users command

6 years agoAdd list user command
Nicolas Hart [Sun, 30 Jul 2017 20:04:29 +0000 (22:04 +0200)] 
Add list user command

6 years agoMerge pull request #3297 from nclsHart/commands-better-rendering
Jérémy Benoist [Sun, 30 Jul 2017 06:31:04 +0000 (08:31 +0200)] 
Merge pull request #3297 from nclsHart/commands-better-rendering

Better rendering for all core commands

6 years agoMerge pull request #3298 from nclsHart/fix-namespace-phpdoc
Jérémy Benoist [Sun, 30 Jul 2017 06:27:39 +0000 (08:27 +0200)] 
Merge pull request #3298 from nclsHart/fix-namespace-phpdoc

Fix some namespaces and phpdoc

6 years agoMerge pull request #3299 from nclsHart/missing-method-prepare-entry
Jérémy Benoist [Sun, 30 Jul 2017 06:10:50 +0000 (08:10 +0200)] 
Merge pull request #3299 from nclsHart/missing-method-prepare-entry

Add missing abstract method prepareEntry in BrowserImport

6 years agoAdd missing abstract method prepareEntry in BrowserImport 3299/head
Nicolas Hart [Sat, 29 Jul 2017 20:59:11 +0000 (22:59 +0200)] 
Add missing abstract method prepareEntry in BrowserImport

6 years agoFix some namespaces and phpdoc 3298/head
Nicolas Hart [Sat, 29 Jul 2017 20:51:50 +0000 (22:51 +0200)] 
Fix some namespaces and phpdoc

6 years agoBetter rendering for all core commands 3297/head
Nicolas Hart [Fri, 28 Jul 2017 22:30:22 +0000 (00:30 +0200)] 
Better rendering for all core commands

6 years agoMerge pull request #3290 from nclsHart/fix-3019
Jérémy Benoist [Sat, 29 Jul 2017 07:34:29 +0000 (09:34 +0200)] 
Merge pull request #3290 from nclsHart/fix-3019

Add a dedicated title for all entries page

6 years agoMerge pull request #3291 from nclsHart/show-user-io
Jérémy Benoist [Fri, 28 Jul 2017 05:38:15 +0000 (07:38 +0200)] 
Merge pull request #3291 from nclsHart/show-user-io

Better rendering for show user command using symfony style

6 years agoMerge pull request #3292 from nclsHart/remove-getdoctrine
Jérémy Benoist [Fri, 28 Jul 2017 05:36:27 +0000 (07:36 +0200)] 
Merge pull request #3292 from nclsHart/remove-getdoctrine

Remove unused method getDoctrine in several commands

6 years agoMerge pull request #3293 from nclsHart/remove-unused-use
Jérémy Benoist [Fri, 28 Jul 2017 05:35:48 +0000 (07:35 +0200)] 
Merge pull request #3293 from nclsHart/remove-unused-use

Remove unused use statement in install command

6 years agoRemove unused use statement in install command 3293/head
Nicolas Hart [Thu, 27 Jul 2017 21:51:01 +0000 (23:51 +0200)] 
Remove unused use statement in install command

6 years agoRemove unused method getDoctrine in several commands 3292/head
Nicolas Hart [Thu, 27 Jul 2017 21:44:12 +0000 (23:44 +0200)] 
Remove unused method getDoctrine in several commands

6 years agoBetter rendering for show user command using symfony style 3291/head
Nicolas Hart [Thu, 27 Jul 2017 21:25:27 +0000 (23:25 +0200)] 
Better rendering for show user command using symfony style

6 years agoadd a dedicated title for all entries page 3290/head
Nicolas Hart [Thu, 27 Jul 2017 20:35:59 +0000 (22:35 +0200)] 
add a dedicated title for all entries page

6 years agoMerge pull request #3280 from Simounet/fix/2.3-date
Jérémy Benoist [Tue, 25 Jul 2017 14:54:43 +0000 (16:54 +0200)] 
Merge pull request #3280 from Simounet/fix/2.3-date

Fix updatePublishedAt on already parsed article's date

6 years agoMerge pull request #3284 from wallabag/travis-7.2
Jérémy Benoist [Mon, 24 Jul 2017 15:38:41 +0000 (17:38 +0200)] 
Merge pull request #3284 from wallabag/travis-7.2

Testing on PHP 7.2

6 years agoAdd a test for updatePublishedAt 3280/head
Jeremy Benoist [Mon, 24 Jul 2017 14:39:29 +0000 (16:39 +0200)] 
Add a test for updatePublishedAt

To avoid error when a content is re-submitted and it previously add a
published date.

Also, fix the `testPostSameEntry`

6 years agoFix updatePublishedAt on already parsed article's date
Simounet [Wed, 19 Jul 2017 18:16:23 +0000 (20:16 +0200)] 
Fix updatePublishedAt on already parsed article's date

6 years agoTesting on PHP 7.2 3284/head
Jérémy Benoist [Mon, 24 Jul 2017 13:48:53 +0000 (15:48 +0200)] 
Testing on PHP 7.2

6 years agoMerge pull request #3283 from wallabag/fix-language-validation
Jérémy Benoist [Mon, 24 Jul 2017 11:54:01 +0000 (13:54 +0200)] 
Merge pull request #3283 from wallabag/fix-language-validation

Put the final URL in data test

6 years agoCS 3283/head
Jeremy Benoist [Mon, 24 Jul 2017 09:52:43 +0000 (11:52 +0200)] 
CS

6 years agoPut the final URL in data test
Jeremy Benoist [Mon, 24 Jul 2017 09:12:54 +0000 (11:12 +0200)] 
Put the final URL in data test

6 years agoMerge pull request #3266 from egilli/export-domain-as-author
Jérémy Benoist [Tue, 11 Jul 2017 07:21:49 +0000 (09:21 +0200)] 
Merge pull request #3266 from egilli/export-domain-as-author

Use the article publisher as author for exported files

6 years agoMerge pull request #3270 from wallabag/do-not-allow-html-api
Jérémy Benoist [Tue, 11 Jul 2017 05:30:30 +0000 (07:30 +0200)] 
Merge pull request #3270 from wallabag/do-not-allow-html-api

Disallow html for API templating formats

6 years agoMerge pull request #3264 from wallabag/trait-timestamps
Jérémy Benoist [Tue, 11 Jul 2017 05:30:08 +0000 (07:30 +0200)] 
Merge pull request #3264 from wallabag/trait-timestamps

Add EntityTimestampsTrait to handle dates

6 years agoMake updateAuthor code simpler to read 3266/head
Étienne Gilli [Mon, 10 Jul 2017 07:58:18 +0000 (09:58 +0200)] 
Make updateAuthor code simpler to read

6 years agoMerge pull request #3267 from wallabag/revert-client-credentials
Jérémy Benoist [Sun, 9 Jul 2017 19:22:28 +0000 (21:22 +0200)] 
Merge pull request #3267 from wallabag/revert-client-credentials

Revert client_credentials grant types

6 years agoUse the article publisher as author for export
Étienne Gilli [Sun, 9 Jul 2017 16:33:14 +0000 (18:33 +0200)] 
Use the article publisher as author for export

When exporting an entry, use the publishedBy field as author name for
epub, mobi and pdf formats. Fallback to domain name if empty.

6 years agoDisallow html for templating formats 3270/head
Jeremy Benoist [Sun, 9 Jul 2017 08:07:14 +0000 (10:07 +0200)] 
Disallow html for templating formats

Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.

6 years agoUse the article domain as author for export files
Étienne Gilli [Sat, 8 Jul 2017 15:55:58 +0000 (17:55 +0200)] 
Use the article domain as author for export files

When exporting an entry, use the domain name as author name for epub,
mobi and pdf formats, instead of 'wallabag'.
Change the author from array to string, because for now, there is always
only one author.

6 years agoRevert client_credentials grant types 3267/head
Jeremy Benoist [Sat, 8 Jul 2017 17:28:12 +0000 (19:28 +0200)] 
Revert client_credentials grant types

6 years agoAdd EntityTimestampsTrait to handle dates 3264/head
Jeremy Benoist [Thu, 6 Jul 2017 07:00:37 +0000 (09:00 +0200)] 
Add EntityTimestampsTrait to handle dates

Refactorize timestamps() method to avoid re-writing it on each entity

6 years agoMerge pull request #3256 from wallabag/fix-patch
Jérémy Benoist [Wed, 5 Jul 2017 13:00:24 +0000 (15:00 +0200)] 
Merge pull request #3256 from wallabag/fix-patch

Fix PATCH method

6 years agoMerge pull request #3257 from wallabag/fix-mapping-entities
Jérémy Benoist [Mon, 3 Jul 2017 15:15:45 +0000 (17:15 +0200)] 
Merge pull request #3257 from wallabag/fix-mapping-entities

Fixed mapping entities

6 years agoCS 3256/head
Jeremy Benoist [Mon, 3 Jul 2017 11:56:39 +0000 (13:56 +0200)] 
CS

6 years agoFix validateAndSetPreviewPicture
Jeremy Benoist [Fri, 30 Jun 2017 15:04:40 +0000 (17:04 +0200)] 
Fix validateAndSetPreviewPicture

Which wasn't covered by a test!

6 years agoFix PATCH method
Jeremy Benoist [Fri, 30 Jun 2017 14:54:26 +0000 (16:54 +0200)] 
Fix PATCH method

The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.

6 years agoCS 3257/head
Jeremy Benoist [Mon, 3 Jul 2017 09:49:46 +0000 (11:49 +0200)] 
CS

6 years agoFixed mapping entities
Jeremy Benoist [Sat, 1 Jul 2017 07:32:13 +0000 (09:32 +0200)] 
Fixed mapping entities

There were this error in the console:

> The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.

6 years agoMerge pull request #3258 from wallabag/cs-fixer
Jérémy Benoist [Mon, 3 Jul 2017 11:39:54 +0000 (13:39 +0200)] 
Merge pull request #3258 from wallabag/cs-fixer

Add a real configuration for CS-Fixer

6 years agoFix tests 3258/head
Jeremy Benoist [Mon, 3 Jul 2017 05:30:54 +0000 (07:30 +0200)] 
Fix tests

6 years agoAdd a real configuration for CS-Fixer
Jeremy Benoist [Sat, 1 Jul 2017 07:52:38 +0000 (09:52 +0200)] 
Add a real configuration for CS-Fixer

6 years agoMerge pull request #3245 from wallabag/fix-bc
Jérémy Benoist [Thu, 29 Jun 2017 09:17:58 +0000 (11:17 +0200)] 
Merge pull request #3245 from wallabag/fix-bc

Avoid BC on exists endpoint

6 years agoCS 3245/head
Jérémy Benoist [Wed, 28 Jun 2017 07:18:22 +0000 (09:18 +0200)] 
CS

6 years agoReturn null instead of false
Jeremy Benoist [Wed, 28 Jun 2017 06:15:06 +0000 (08:15 +0200)] 
Return null instead of false

6 years agoMerge remote-tracking branch 'origin/master' into 2.3
Jeremy Benoist [Mon, 26 Jun 2017 08:05:48 +0000 (10:05 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.3

6 years agoMerge pull request #3237 from matteocoder/master
Jérémy Benoist [Mon, 26 Jun 2017 08:00:35 +0000 (10:00 +0200)] 
Merge pull request #3237 from matteocoder/master

Revised messages.it.yml file

6 years agoFixed broken lines and added new lines 3237/head
matteocoder [Sat, 24 Jun 2017 09:06:09 +0000 (11:06 +0200)] 
Fixed broken lines and added new lines

In addition to fixing broken lines, I've also added a couple of lines from recent PRs.

6 years agoAvoid BC on exists endpoint
Jeremy Benoist [Fri, 23 Jun 2017 06:30:23 +0000 (08:30 +0200)] 
Avoid BC on exists endpoint

6 years agoMerge pull request #3204 from wallabag/better-export-page
Jérémy Benoist [Thu, 22 Jun 2017 13:34:46 +0000 (15:34 +0200)] 
Merge pull request #3204 from wallabag/better-export-page

Better public sharing page

6 years agoDon't load js for nothing in prod 3204/head
Thomas Citharel [Thu, 22 Jun 2017 12:55:49 +0000 (14:55 +0200)] 
Don't load js for nothing in prod

6 years agoAdd css on share public page
Thomas Citharel [Thu, 22 Jun 2017 10:15:24 +0000 (12:15 +0200)] 
Add css on share public page

6 years agoAdd share.scss file
Jeremy Benoist [Tue, 20 Jun 2017 05:14:37 +0000 (07:14 +0200)] 
Add share.scss file

Still needs to include it in the twig template

6 years agoFix linter issue on webpack config files
Jeremy Benoist [Tue, 20 Jun 2017 05:14:04 +0000 (07:14 +0200)] 
Fix linter issue on webpack config files

6 years agoadd :it: shared_by_wallabag string translated by @matteocoder
Sven Fischer [Sat, 17 Jun 2017 07:38:13 +0000 (09:38 +0200)] 
add :it: shared_by_wallabag string translated by @matteocoder

6 years agoadjust :de: shared_by_wallabag string to include user info
Sven Fischer [Sat, 17 Jun 2017 07:36:08 +0000 (09:36 +0200)] 
adjust :de: shared_by_wallabag string to include user info

6 years agoBetter export page
Jeremy Benoist [Sat, 10 Jun 2017 10:13:30 +0000 (12:13 +0200)] 
Better export page

I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?

6 years agoMerge pull request #3241 from wallabag/fix-qr-code-trans
Nicolas Lœuillet [Thu, 22 Jun 2017 08:26:41 +0000 (10:26 +0200)] 
Merge pull request #3241 from wallabag/fix-qr-code-trans

Fix translations on QR code instructions

6 years agoMerge pull request #3227 from wallabag/oauth-client-credentials
Nicolas Lœuillet [Thu, 22 Jun 2017 08:00:23 +0000 (10:00 +0200)] 
Merge pull request #3227 from wallabag/oauth-client-credentials

Add client_credentials oAuth2 auth method

6 years agoAdd :it: translation 3241/head
Jérémy Benoist [Thu, 22 Jun 2017 06:59:25 +0000 (08:59 +0200)] 
Add :it: translation

6 years agoUpdate polish
Mateusz Rumiński [Tue, 20 Jun 2017 19:18:38 +0000 (21:18 +0200)] 
Update polish

add missing translation

6 years agoFix translations on QR code instructions
Thomas Citharel [Tue, 20 Jun 2017 16:43:10 +0000 (18:43 +0200)] 
Fix translations on QR code instructions

6 years agoMerge pull request #3207 from wallabag/tag-rss
Jérémy Benoist [Wed, 21 Jun 2017 12:51:46 +0000 (14:51 +0200)] 
Merge pull request #3207 from wallabag/tag-rss

Add RSS for tags

6 years agoAdd all entries RSS feed and put links on tag page itself and baggy too 3207/head
Thomas Citharel [Tue, 20 Jun 2017 16:29:46 +0000 (18:29 +0200)] 
Add all entries RSS feed and put links on tag page itself and baggy too

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
6 years agoFix typo
Jeremy Benoist [Sun, 18 Jun 2017 12:58:50 +0000 (14:58 +0200)] 
Fix typo

6 years agoadd rss icon
Thomas Citharel [Tue, 13 Jun 2017 12:17:04 +0000 (14:17 +0200)] 
add rss icon

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
6 years agoFix tests
Jeremy Benoist [Sat, 10 Jun 2017 12:24:42 +0000 (14:24 +0200)] 
Fix tests

6 years agoFix getContainer in command
Jeremy Benoist [Sat, 10 Jun 2017 11:19:43 +0000 (13:19 +0200)] 
Fix getContainer in command

6 years agoAdd RSS tags feeds
Jeremy Benoist [Sat, 10 Jun 2017 11:11:08 +0000 (13:11 +0200)] 
Add RSS tags feeds

6 years agoUser existing service instead of getDoctrine
Jeremy Benoist [Sat, 10 Jun 2017 10:33:58 +0000 (12:33 +0200)] 
User existing service instead of getDoctrine

6 years agoMerge pull request #2683 from wallabag/credentials-in-db
Jérémy Benoist [Tue, 20 Jun 2017 14:40:48 +0000 (16:40 +0200)] 
Merge pull request #2683 from wallabag/credentials-in-db

Store credentials in DB

6 years agoGet rid of masked value in listing 2683/head
Jeremy Benoist [Sun, 18 Jun 2017 13:34:59 +0000 (15:34 +0200)] 
Get rid of masked value in listing

6 years agoFix reviews
Thomas Citharel [Wed, 14 Jun 2017 13:02:34 +0000 (15:02 +0200)] 
Fix reviews

Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>