aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ /
* | | Merge pull request #3326 from nclsHart/reload-entry-commandJérémy Benoist2017-08-224-2/+224
|\ \ \
| * | | rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserIdNicolas Hart2017-08-222-2/+2
| * | | rename getAllEntriesId into findAllEntriesIdByUserIdNicolas Hart2017-08-222-2/+2
| * | | Add reload entry commandNicolas Hart2017-08-213-0/+222
|/ / /
* | | Merge pull request #3319 from Quent-in/2.3Jérémy Benoist2017-08-101-2/+2
|\ \ \
| * | | Small changeQuent-in2017-08-091-2/+2
* | | | Merge pull request #3314 from nclsHart/fix-3313Jérémy Benoist2017-08-083-39/+23
|\ \ \ \
| * | | | Reduce number of queries on tag listNicolas Hart2017-08-063-39/+23
* | | | | Merge pull request #3317 from wallabag/mruminski-patch-1Jérémy Benoist2017-08-081-13/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update messages.pl.ymlMateusz Rumiński2017-08-081-13/+13
|/ / / /
* | | | Merge pull request #3312 from Quent-in/2.3Jérémy Benoist2017-08-063-42/+42
|\| | |
| * | | Correction apostrophe encadrée par simples apostrophesQuent-in2017-08-051-1/+1
| * | | Correction indent. L538Quent-in2017-08-051-1/+1
| * | | UpdateQuent-in2017-08-051-3/+3
| * | | Update OC: correction fautes de frappeQuent-in2017-08-051-16/+16
| * | | Update with new stringsQuent-in2017-08-051-21/+21
| * | | Update registration using APIQuent-in2017-08-051-2/+2
* | | | Merge pull request #3311 from nclsHart/makefile-webpackJérémy Benoist2017-08-051-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix make build by replacing grunt with webpackNicolas Hart2017-08-051-2/+2