aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3372 from wallabag/translate-export-pageNicolas Lœuillet2017-10-1114-8/+47
|\
| * CSJeremy Benoist2017-10-111-3/+3
| * Fixed @j0k3r's reviewNicolas Lœuillet2017-10-111-0/+1
| * Fixed @tcitworld's reviewNicolas Lœuillet2017-10-112-7/+3
| * Translated first page of exported articleNicolas Lœuillet2017-10-1114-2/+44
|/
* Merge pull request #3376 from wallabag/symfony-3.3Jérémy Benoist2017-10-1144-68/+90
|\
| * Fix MondeDiplo https urlJeremy Benoist2017-10-101-1/+1
| * CSJeremy Benoist2017-10-0927-37/+37
| * Jump to Symfony 3.3 & update others depsJeremy Benoist2017-10-0918-30/+52
* | Merge pull request #3378 from wallabag/2.3-ruJérémy Benoist2017-10-105-0/+617
|\ \ | |/ |/|
| * update Russian languageОлег2017-10-103-90/+96
| * add Russian languageОлег2017-10-102-0/+12
| * Add Russian language in CoreBundle Resources and CraueConfigBundleОлег2017-10-102-0/+599
|/
* Merge pull request #3347 from Kdecherf/entry-statsNicolas Lœuillet2017-09-161-2/+7
|\
| * Entry view: update .stats margins and colorKevin Decherf2017-09-091-2/+7
* | Merge pull request #3345 from wallabag/Quent-in-patch-1Jérémy Benoist2017-09-091-1/+1
|\ \
| * | Update messages.oc.ymlQuent-in2017-09-091-1/+1
|/ /
* | Merge pull request #3340 from Kdecherf/fix-webpackJérémy Benoist2017-09-072-2/+2
|\ \
| * | Fix webpack error on commentsKevin Decherf2017-09-062-2/+2
| |/
* | Merge pull request #3309 from wallabag/fix-multiple-tag-searchJérémy Benoist2017-09-075-10/+36
|\ \
| * | Remove unused functionJeremy Benoist2017-09-061-20/+0
| * | Fix testsJeremy Benoist2017-09-062-2/+3
| * | Multiple tag search was broken from APIJeremy Benoist2017-09-065-10/+55
|/ /
* | Merge pull request #3332 from nclsHart/better-txt-exportNicolas Lœuillet2017-09-062-2/+5
|\ \ | |/ |/|
| * better entry txt export using html2textNicolas Hart2017-08-272-2/+5
* | Merge pull request #3337 from strobeltobias/patch-1Jérémy Benoist2017-09-041-90/+90
|\ \
| * | Update messages.de.ymlJérémy Benoist2017-09-041-1/+1
| * | Update to comply with suggested changesTobias Strobel2017-09-031-7/+7
| * | Add missing quotation marks and small fixes (2)Tobias Strobel2017-09-011-90/+90
* | | Merge pull request #3333 from Quent-in/2.3Jérémy Benoist2017-09-034-60/+60
|\ \ \
| * | | Update wallabag_user.oc.ymlQuent-in2017-08-301-2/+2
| * | | Update CraueConfigBundle.oc.ymlQuent-in2017-08-301-1/+1
| * | | Update validators.oc.ymlQuent-in2017-08-301-2/+2
| * | | UpdateQuent-in2017-08-301-55/+55
| |/ /
* | | Merge pull request #3139 from Kdecherf/2502-tag-caseJérémy Benoist2017-09-036-6/+111
|\ \ \
| * | | php-cs-fixer on DoctrineMigrations/Version20170719231144Kevin Decherf2017-08-271-24/+24
| * | | Fix testsJeremy Benoist2017-08-271-1/+1
| * | | Add migration to change case of tagsKevin Decherf2017-08-271-0/+103
| * | | Tag: render tags case-insensitive by storing them in lowercaseKevin Decherf2017-08-274-5/+7
| | |/ | |/|
* | | Merge pull request #3338 from strobeltobias/patch-2Jérémy Benoist2017-09-031-36/+36
|\ \ \ | |_|/ |/| |
| * | Translate missing strings, add quotation marksTobias Strobel2017-09-011-36/+36
|/ /
* | Merge pull request #3330 from franek/set-starred-dateJérémy Benoist2017-08-306-7/+124
|\ \
| * | Set a starred_at field when an entry is starred.François D2017-08-256-7/+124
| |/
* | Merge pull request #3294 from wallabag/export-tag-nullJérémy Benoist2017-08-302-2/+2
|\ \ | |/ |/|
| * Empty currentTag should be nullJeremy Benoist2017-07-282-2/+2
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-08-222-4/+4
|\ \
| * \ Merge pull request #3323 from egilli/fix-export-link-with-baggyJérémy Benoist2017-08-141-3/+3
| |\ \
| | * | Fix export links in baggy themeÉtienne Gilli2017-08-131-3/+3
| |/ /
| * | Merge pull request #3322 from braco/patch-1Jérémy Benoist2017-08-121-1/+1
| |\ \
| | * | Update Readme with crucial informationbraco2017-08-101-1/+1
| |/ /