]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoMerge pull request #3395 from wallabag/issue-3393
Kevin Decherf [Wed, 1 Nov 2017 10:12:44 +0000 (11:12 +0100)] 
Merge pull request #3395 from wallabag/issue-3393

views/config: fix overlaying drop down menu

7 years agoviews/config: fix overlaying drop down menu 3395/head
Kevin Decherf [Tue, 31 Oct 2017 22:16:15 +0000 (23:16 +0100)] 
views/config: fix overlaying drop down menu

Fixes #3393

7 years agoMerge pull request #3392 from mart-e/add-title-page-epub
Jérémy Benoist [Tue, 31 Oct 2017 13:10:41 +0000 (15:10 +0200)] 
Merge pull request #3392 from mart-e/add-title-page-epub

add the title of article on the epub export

7 years agoProperly run php-cs-fixer 3392/head
Jeremy Benoist [Sat, 28 Oct 2017 18:16:43 +0000 (20:16 +0200)] 
Properly run php-cs-fixer

7 years agophp-cs-fixer
Martin Trigaux [Sat, 28 Oct 2017 15:17:22 +0000 (17:17 +0200)] 
php-cs-fixer

php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php

7 years agoSet the title in a separated chapter
Martin Trigaux [Sat, 28 Oct 2017 12:49:14 +0000 (14:49 +0200)] 
Set the title in a separated chapter
Set the export option on the same page, same as done in producePdf
Move the ToC at the end of the book so the title page is the first one

7 years agoadd a title page
Martin Trigaux [Sat, 28 Oct 2017 08:37:56 +0000 (10:37 +0200)] 
add a title page

The first page of the book is the title

7 years agoMerge pull request #3011 from wallabag/2.3
Jérémy Benoist [Mon, 23 Oct 2017 09:09:17 +0000 (11:09 +0200)] 
Merge pull request #3011 from wallabag/2.3

wallabag 2.3.0

7 years agoMerge pull request #3385 from wallabag/prepare-23 3011/head
Nicolas Lœuillet [Fri, 20 Oct 2017 13:43:13 +0000 (15:43 +0200)] 
Merge pull request #3385 from wallabag/prepare-23

Prepare wallabag 2.3.0

7 years agoPrepare wallabag 2.3.0 3385/head
Nicolas Lœuillet [Fri, 20 Oct 2017 12:17:37 +0000 (14:17 +0200)] 
Prepare wallabag 2.3.0

7 years agoMerge pull request #3384 from wallabag/mruminski-patch-1
Nicolas Lœuillet [Thu, 19 Oct 2017 13:07:43 +0000 (15:07 +0200)] 
Merge pull request #3384 from wallabag/mruminski-patch-1

Update messages.pl.yml

7 years agoUpdate messages.pl.yml 3384/head
Mateusz Rumiński [Thu, 19 Oct 2017 11:07:24 +0000 (13:07 +0200)] 
Update messages.pl.yml

add polish translation for export footer_template

7 years agoMerge pull request #3373 from wallabag/change-readingtime-notnull
Nicolas Lœuillet [Wed, 18 Oct 2017 09:33:30 +0000 (11:33 +0200)] 
Merge pull request #3373 from wallabag/change-readingtime-notnull

Changed reading_time field to prevent null values

7 years agoMerge pull request #3362 from sviande/fix_3361_api_warning
Jérémy Benoist [Wed, 18 Oct 2017 09:16:50 +0000 (11:16 +0200)] 
Merge pull request #3362 from sviande/fix_3361_api_warning

Fix #3361 check type for tags in entry repository

7 years agoMerge pull request #3383 from Kdecherf/fix-webpack-and-login
Nicolas Lœuillet [Mon, 16 Oct 2017 07:02:47 +0000 (09:02 +0200)] 
Merge pull request #3383 from Kdecherf/fix-webpack-and-login

Fix webpack and login screen

7 years agoUpdate prod assets 3383/head
Kevin Decherf [Sun, 15 Oct 2017 22:07:12 +0000 (00:07 +0200)] 
Update prod assets

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agowebpack: handle _global img folder
Kevin Decherf [Sun, 15 Oct 2017 21:57:35 +0000 (23:57 +0200)] 
webpack: handle _global img folder

Fixes missing image files after composer cleaning assets

Source of requireAll(): https://stackoverflow.com/a/30652110

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoFix non-centered login form
Kevin Decherf [Sun, 15 Oct 2017 21:56:34 +0000 (23:56 +0200)] 
Fix non-centered login form

Fixes #3343

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #3382 from nclsHart/replace-kernel-rootdir
Jérémy Benoist [Sun, 15 Oct 2017 07:24:32 +0000 (09:24 +0200)] 
Merge pull request #3382 from nclsHart/replace-kernel-rootdir

 Replace kernel.root_dir by kernel.project_dir

7 years agoMerge pull request #3381 from nclsHart/webserverbundle
Jérémy Benoist [Sun, 15 Oct 2017 07:23:31 +0000 (09:23 +0200)] 
Merge pull request #3381 from nclsHart/webserverbundle

Enable WebServerBundle in dev environment

7 years agoReplace kernel.root_dir by kernel.project_dir 3382/head
Nicolas Hart [Fri, 13 Oct 2017 21:52:15 +0000 (23:52 +0200)] 
Replace kernel.root_dir by kernel.project_dir

kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.

7 years agoEnable WebServerBundle in dev environment 3381/head
Nicolas Hart [Fri, 13 Oct 2017 21:04:16 +0000 (23:04 +0200)] 
Enable WebServerBundle in dev environment

Since #3376, the web server console commands were not available.

7 years agoFix #3361 Entry Rest controller getEntries cast tags params to string 3362/head
Sébastien Viande [Thu, 12 Oct 2017 05:28:42 +0000 (07:28 +0200)] 
Fix #3361 Entry Rest controller getEntries cast tags params to string

7 years agoFixed @Kdecherf's review 3373/head
Nicolas Lœuillet [Fri, 13 Oct 2017 07:37:03 +0000 (09:37 +0200)] 
Fixed @Kdecherf's review

7 years agoCS
Jeremy Benoist [Wed, 11 Oct 2017 08:42:24 +0000 (10:42 +0200)] 
CS

7 years agoChanged reading_time field to prevent null values
Nicolas Lœuillet [Sun, 8 Oct 2017 20:08:18 +0000 (22:08 +0200)] 
Changed reading_time field to prevent null values

7 years agoCS
Jeremy Benoist [Wed, 11 Oct 2017 08:51:24 +0000 (10:51 +0200)] 
CS

7 years agoFix #3361 add test
Sébastien Viande [Tue, 26 Sep 2017 09:29:09 +0000 (11:29 +0200)] 
Fix #3361 add test

7 years agoFix #3361 check type for tags in entry repository
Sébastien Viande [Mon, 25 Sep 2017 17:34:42 +0000 (19:34 +0200)] 
Fix #3361 check type for tags in entry repository

Check is $tags is a string before explode

7 years agoMerge pull request #3372 from wallabag/translate-export-page
Nicolas Lœuillet [Wed, 11 Oct 2017 12:12:49 +0000 (14:12 +0200)] 
Merge pull request #3372 from wallabag/translate-export-page

Translated first page of exported article

7 years agoCS 3372/head
Jeremy Benoist [Wed, 11 Oct 2017 08:43:36 +0000 (10:43 +0200)] 
CS

7 years agoFixed @j0k3r's review
Nicolas Lœuillet [Sun, 8 Oct 2017 18:39:44 +0000 (20:39 +0200)] 
Fixed @j0k3r's review

7 years agoFixed @tcitworld's review
Nicolas Lœuillet [Sun, 8 Oct 2017 09:03:32 +0000 (11:03 +0200)] 
Fixed @tcitworld's review

7 years agoTranslated first page of exported article
Nicolas Lœuillet [Sun, 8 Oct 2017 06:55:30 +0000 (08:55 +0200)] 
Translated first page of exported article

7 years agoMerge pull request #3376 from wallabag/symfony-3.3
Jérémy Benoist [Wed, 11 Oct 2017 07:55:03 +0000 (09:55 +0200)] 
Merge pull request #3376 from wallabag/symfony-3.3

Symfony 3.3

7 years agoMerge pull request #3378 from wallabag/2.3-ru
Jérémy Benoist [Tue, 10 Oct 2017 10:22:22 +0000 (12:22 +0200)] 
Merge pull request #3378 from wallabag/2.3-ru

Add Russian language

7 years agoupdate Russian language 3378/head
Олег [Fri, 6 Oct 2017 13:26:50 +0000 (16:26 +0300)] 
update Russian language

7 years agoadd Russian language
Олег [Fri, 6 Oct 2017 12:39:34 +0000 (15:39 +0300)] 
add Russian language

7 years agoAdd Russian language in CoreBundle Resources and CraueConfigBundle
Олег [Fri, 6 Oct 2017 10:14:58 +0000 (13:14 +0300)] 
Add Russian language in CoreBundle Resources and CraueConfigBundle

7 years agoFix MondeDiplo https url 3376/head
Jeremy Benoist [Tue, 10 Oct 2017 08:20:57 +0000 (10:20 +0200)] 
Fix MondeDiplo https url

7 years agoCS
Jeremy Benoist [Mon, 9 Oct 2017 14:47:15 +0000 (16:47 +0200)] 
CS

7 years agoJump to Symfony 3.3 & update others deps
Jeremy Benoist [Mon, 9 Oct 2017 14:45:09 +0000 (16:45 +0200)] 
Jump to Symfony 3.3 & update others deps

Also update tests urls

7 years agoMerge pull request #3347 from Kdecherf/entry-stats
Nicolas Lœuillet [Sat, 16 Sep 2017 11:01:33 +0000 (13:01 +0200)] 
Merge pull request #3347 from Kdecherf/entry-stats

Entry view: update .stats margins and color

7 years agoEntry view: update .stats margins and color 3347/head
Kevin Decherf [Sat, 9 Sep 2017 19:35:19 +0000 (21:35 +0200)] 
Entry view: update .stats margins and color

Decreasing margin of .stats, increasing vertical margin of .stats li,
increasing right margin of material icons and reducing contrast of
material icons.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #3345 from wallabag/Quent-in-patch-1
Jérémy Benoist [Sat, 9 Sep 2017 16:57:50 +0000 (18:57 +0200)] 
Merge pull request #3345 from wallabag/Quent-in-patch-1

Update messages.oc.yml

7 years agoUpdate messages.oc.yml 3345/head
Quent-in [Sat, 9 Sep 2017 16:23:59 +0000 (18:23 +0200)] 
Update messages.oc.yml

7 years agoMerge pull request #3340 from Kdecherf/fix-webpack
Jérémy Benoist [Thu, 7 Sep 2017 05:17:05 +0000 (07:17 +0200)] 
Merge pull request #3340 from Kdecherf/fix-webpack

Fix webpack error on comments

7 years agoMerge pull request #3309 from wallabag/fix-multiple-tag-search
Jérémy Benoist [Thu, 7 Sep 2017 05:16:26 +0000 (07:16 +0200)] 
Merge pull request #3309 from wallabag/fix-multiple-tag-search

Multiple tag search, which was broken from API

7 years agoRemove unused function 3309/head
Jeremy Benoist [Wed, 6 Sep 2017 20:58:34 +0000 (22:58 +0200)] 
Remove unused function

Introduce after the rebase I guess

7 years agoFix tests
Jeremy Benoist [Thu, 3 Aug 2017 14:20:49 +0000 (16:20 +0200)] 
Fix tests

7 years agoMultiple tag search was broken from API
Jeremy Benoist [Thu, 3 Aug 2017 10:46:20 +0000 (12:46 +0200)] 
Multiple tag search was broken from API

First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.

7 years agoFix webpack error on comments 3340/head
Kevin Decherf [Wed, 6 Sep 2017 20:42:23 +0000 (22:42 +0200)] 
Fix webpack error on comments

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoMerge pull request #3332 from nclsHart/better-txt-export
Nicolas Lœuillet [Wed, 6 Sep 2017 13:08:12 +0000 (15:08 +0200)] 
Merge pull request #3332 from nclsHart/better-txt-export

Better entry txt export using html2text

7 years agoMerge pull request #3337 from strobeltobias/patch-1
Jérémy Benoist [Mon, 4 Sep 2017 10:09:26 +0000 (12:09 +0200)] 
Merge pull request #3337 from strobeltobias/patch-1

Add missing quotation marks and small fixes (2)

7 years agoUpdate messages.de.yml 3337/head
Jérémy Benoist [Mon, 4 Sep 2017 09:17:26 +0000 (11:17 +0200)] 
Update messages.de.yml

7 years agoMerge pull request #3333 from Quent-in/2.3
Jérémy Benoist [Sun, 3 Sep 2017 18:26:16 +0000 (20:26 +0200)] 
Merge pull request #3333 from Quent-in/2.3

Update OC

7 years agoMerge pull request #3139 from Kdecherf/2502-tag-case
Jérémy Benoist [Sun, 3 Sep 2017 18:25:15 +0000 (20:25 +0200)] 
Merge pull request #3139 from Kdecherf/2502-tag-case

Ignore tag's case

7 years agoMerge pull request #3338 from strobeltobias/patch-2
Jérémy Benoist [Sun, 3 Sep 2017 18:24:41 +0000 (20:24 +0200)] 
Merge pull request #3338 from strobeltobias/patch-2

Translate missing strings, add quotation marks

7 years agoUpdate to comply with suggested changes
Tobias Strobel [Sun, 3 Sep 2017 13:15:38 +0000 (15:15 +0200)] 
Update to comply with suggested changes

7 years agoTranslate missing strings, add quotation marks 3338/head
Tobias Strobel [Fri, 1 Sep 2017 21:15:18 +0000 (23:15 +0200)] 
Translate missing strings, add quotation marks

7 years agoAdd missing quotation marks and small fixes (2)
Tobias Strobel [Fri, 1 Sep 2017 21:01:57 +0000 (23:01 +0200)] 
Add missing quotation marks and small fixes (2)

7 years agoUpdate wallabag_user.oc.yml 3333/head
Quent-in [Wed, 30 Aug 2017 18:10:58 +0000 (20:10 +0200)] 
Update wallabag_user.oc.yml

7 years agoUpdate CraueConfigBundle.oc.yml
Quent-in [Wed, 30 Aug 2017 18:09:16 +0000 (20:09 +0200)] 
Update CraueConfigBundle.oc.yml

7 years agoUpdate validators.oc.yml
Quent-in [Wed, 30 Aug 2017 18:06:34 +0000 (20:06 +0200)] 
Update validators.oc.yml

7 years agoUpdate
Quent-in [Wed, 30 Aug 2017 18:01:11 +0000 (20:01 +0200)] 
Update

7 years agoMerge pull request #3330 from franek/set-starred-date
Jérémy Benoist [Wed, 30 Aug 2017 11:53:49 +0000 (13:53 +0200)] 
Merge pull request #3330 from franek/set-starred-date

Add starred_at field which is set when an entry is starred

7 years agoMerge pull request #3294 from wallabag/export-tag-null
Jérémy Benoist [Wed, 30 Aug 2017 11:51:20 +0000 (13:51 +0200)] 
Merge pull request #3294 from wallabag/export-tag-null

Empty currentTag should be null

7 years agophp-cs-fixer on DoctrineMigrations/Version20170719231144 3139/head
Kevin Decherf [Sun, 27 Aug 2017 14:59:02 +0000 (16:59 +0200)] 
php-cs-fixer on DoctrineMigrations/Version20170719231144

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoFix tests
Jeremy Benoist [Sat, 1 Jul 2017 06:41:55 +0000 (08:41 +0200)] 
Fix tests

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoAdd migration to change case of tags
Kevin Decherf [Thu, 20 Jul 2017 20:05:44 +0000 (22:05 +0200)] 
Add migration to change case of tags

This migration does not support SQLite as long as this engine does not
support Unicode in LOWER().

This migration starts by retrieving the list of lowercase tags which
need to be migrated. Then it retrieves the list of tags for each tags
from the previous step in order to migrate entries. It handles deletion
of empty tags. At the end the migration makes a full scan to update the
label of all remaining tags.

WARNING: THIS MIGRATION IS IRREVERSIBLE.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoTag: render tags case-insensitive by storing them in lowercase
Kevin Decherf [Sun, 21 May 2017 15:01:59 +0000 (17:01 +0200)] 
Tag: render tags case-insensitive by storing them in lowercase

Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agobetter entry txt export using html2text 3332/head
Nicolas Hart [Sat, 26 Aug 2017 22:04:21 +0000 (00:04 +0200)] 
better entry txt export using html2text

7 years agoSet a starred_at field when an entry is starred. 3330/head
François D [Wed, 23 Aug 2017 21:06:40 +0000 (23:06 +0200)] 
Set a starred_at field when an entry is starred.
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.

7 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

7 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

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

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

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

7 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

7 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

7 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

7 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

7 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

7 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.

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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.

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

7 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

7 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

7 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

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