Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CS | Jeremy Benoist | 2017-10-13 | 1 | -3/+3 |
| | |||||
* | Changed reading_time field to prevent null values | Nicolas Lœuillet | 2017-10-13 | 2 | -2/+65 |
| | |||||
* | Merge pull request #3372 from wallabag/translate-export-page | Nicolas Lœuillet | 2017-10-11 | 14 | -8/+47 |
|\ | | | | | Translated first page of exported article | ||||
| * | CS | Jeremy Benoist | 2017-10-11 | 1 | -3/+3 |
| | | |||||
| * | Fixed @j0k3r's review | Nicolas Lœuillet | 2017-10-11 | 1 | -0/+1 |
| | | |||||
| * | Fixed @tcitworld's review | Nicolas Lœuillet | 2017-10-11 | 2 | -7/+3 |
| | | |||||
| * | Translated first page of exported article | Nicolas Lœuillet | 2017-10-11 | 14 | -2/+44 |
|/ | |||||
* | Merge pull request #3376 from wallabag/symfony-3.3 | Jérémy Benoist | 2017-10-11 | 44 | -68/+90 |
|\ | | | | | Symfony 3.3 | ||||
| * | Fix MondeDiplo https url | Jeremy Benoist | 2017-10-10 | 1 | -1/+1 |
| | | |||||
| * | CS | Jeremy Benoist | 2017-10-09 | 27 | -37/+37 |
| | | |||||
| * | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 18 | -30/+52 |
| | | | | | | | | Also update tests urls | ||||
* | | Merge pull request #3378 from wallabag/2.3-ru | Jérémy Benoist | 2017-10-10 | 5 | -0/+617 |
|\ \ | |/ |/| | Add Russian language | ||||
| * | update Russian language | Олег | 2017-10-10 | 3 | -90/+96 |
| | | |||||
| * | add Russian language | Олег | 2017-10-10 | 2 | -0/+12 |
| | | |||||
| * | Add Russian language in CoreBundle Resources and CraueConfigBundle | Олег | 2017-10-10 | 2 | -0/+599 |
|/ | |||||
* | Merge pull request #3347 from Kdecherf/entry-stats | Nicolas Lœuillet | 2017-09-16 | 1 | -2/+7 |
|\ | | | | | Entry view: update .stats margins and color | ||||
| * | Entry view: update .stats margins and color | Kevin Decherf | 2017-09-09 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | 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> | ||||
* | | Merge pull request #3345 from wallabag/Quent-in-patch-1 | Jérémy Benoist | 2017-09-09 | 1 | -1/+1 |
|\ \ | | | | | | | Update messages.oc.yml | ||||
| * | | Update messages.oc.yml | Quent-in | 2017-09-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3340 from Kdecherf/fix-webpack | Jérémy Benoist | 2017-09-07 | 2 | -2/+2 |
|\ \ | | | | | | | Fix webpack error on comments | ||||
| * | | Fix webpack error on comments | Kevin Decherf | 2017-09-06 | 2 | -2/+2 |
| |/ | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3309 from wallabag/fix-multiple-tag-search | Jérémy Benoist | 2017-09-07 | 5 | -10/+36 |
|\ \ | | | | | | | Multiple tag search, which was broken from API | ||||
| * | | Remove unused function | Jeremy Benoist | 2017-09-06 | 1 | -20/+0 |
| | | | | | | | | | | | | Introduce after the rebase I guess | ||||
| * | | Fix tests | Jeremy Benoist | 2017-09-06 | 2 | -2/+3 |
| | | | |||||
| * | | Multiple tag search was broken from API | Jeremy Benoist | 2017-09-06 | 5 | -10/+55 |
|/ / | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #3332 from nclsHart/better-txt-export | Nicolas Lœuillet | 2017-09-06 | 2 | -2/+5 |
|\ \ | |/ |/| | Better entry txt export using html2text | ||||
| * | better entry txt export using html2text | Nicolas Hart | 2017-08-27 | 2 | -2/+5 |
| | | |||||
* | | Merge pull request #3337 from strobeltobias/patch-1 | Jérémy Benoist | 2017-09-04 | 1 | -90/+90 |
|\ \ | | | | | | | Add missing quotation marks and small fixes (2) | ||||
| * | | Update messages.de.yml | Jérémy Benoist | 2017-09-04 | 1 | -1/+1 |
| | | | |||||
| * | | Update to comply with suggested changes | Tobias Strobel | 2017-09-03 | 1 | -7/+7 |
| | | | |||||
| * | | Add missing quotation marks and small fixes (2) | Tobias Strobel | 2017-09-01 | 1 | -90/+90 |
| | | | |||||
* | | | Merge pull request #3333 from Quent-in/2.3 | Jérémy Benoist | 2017-09-03 | 4 | -60/+60 |
|\ \ \ | | | | | | | | | Update OC | ||||
| * | | | Update wallabag_user.oc.yml | Quent-in | 2017-08-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update CraueConfigBundle.oc.yml | Quent-in | 2017-08-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update validators.oc.yml | Quent-in | 2017-08-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update | Quent-in | 2017-08-30 | 1 | -55/+55 |
| |/ / | |||||
* | | | Merge pull request #3139 from Kdecherf/2502-tag-case | Jérémy Benoist | 2017-09-03 | 6 | -6/+111 |
|\ \ \ | | | | | | | | | Ignore tag's case | ||||
| * | | | php-cs-fixer on DoctrineMigrations/Version20170719231144 | Kevin Decherf | 2017-08-27 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | Fix tests | Jeremy Benoist | 2017-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | | Add migration to change case of tags | Kevin Decherf | 2017-08-27 | 1 | -0/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | | Tag: render tags case-insensitive by storing them in lowercase | Kevin Decherf | 2017-08-27 | 4 | -5/+7 |
| | |/ | |/| | | | | | | | | | | | | | Fixes #2502 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | Merge pull request #3338 from strobeltobias/patch-2 | Jérémy Benoist | 2017-09-03 | 1 | -36/+36 |
|\ \ \ | |_|/ |/| | | Translate missing strings, add quotation marks | ||||
| * | | Translate missing strings, add quotation marks | Tobias Strobel | 2017-09-01 | 1 | -36/+36 |
|/ / | |||||
* | | Merge pull request #3330 from franek/set-starred-date | Jérémy Benoist | 2017-08-30 | 6 | -7/+124 |
|\ \ | | | | | | | Add starred_at field which is set when an entry is starred | ||||
| * | | Set a starred_at field when an entry is starred. | François D | 2017-08-25 | 6 | -7/+124 |
| |/ | | | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #3294 from wallabag/export-tag-null | Jérémy Benoist | 2017-08-30 | 2 | -2/+2 |
|\ \ | |/ |/| | Empty currentTag should be null | ||||
| * | Empty currentTag should be null | Jeremy Benoist | 2017-07-28 | 2 | -2/+2 |
| | | | | | | | | And when a parameter is null, it won't appear in the url like `?tag=`. | ||||
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-08-22 | 2 | -4/+4 |
|\ \ | |||||
| * \ | Merge pull request #3323 from egilli/fix-export-link-with-baggy | Jérémy Benoist | 2017-08-14 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Fix export links in baggy theme | ||||
| | * | | Fix export links in baggy theme | Étienne Gilli | 2017-08-13 | 1 | -3/+3 |
| |/ / |