Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Define a dev version for the master | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
* | Merge pull request #2411 from wallabag/fix-entities | Nicolas Lœuillet | 2016-10-10 | 2 | -2/+2 |
|\ | |||||
| * | Fix entities definition | Jeremy Benoist | 2016-10-09 | 2 | -2/+2 |
* | | Merge pull request #2414 from szafranek/bugfix-bookmarklet | Jeremy Benoist | 2016-10-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Remove automatic closing of the window from bookmarklet | Krzysztof Szafranek | 2016-10-09 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2413 from wallabag/sub-command-verbose | Jeremy Benoist | 2016-10-10 | 1 | -7/+10 |
|\ \ | |||||
| * | | When a sub command fail, display error message | Jeremy Benoist | 2016-10-09 | 1 | -7/+10 |
|/ / | |||||
* | | Merge pull request #2410 from wallabag/tag-optim | Nicolas Lœuillet | 2016-10-09 | 15 | -47/+104 |
|\ \ | |/ |/| | |||||
| * | CS | Jeremy Benoist | 2016-10-09 | 1 | -1/+2 |
| * | Optimize the way tag list is rendered | Jeremy Benoist | 2016-10-09 | 13 | -45/+92 |
| * | Avoid tag duplication when tagging all articles | Jeremy Benoist | 2016-10-09 | 1 | -1/+7 |
| * | Add more log to tag:all | Jeremy Benoist | 2016-10-09 | 1 | -1/+4 |
|/ | |||||
* | Merge pull request #2406 from szafranek/bugfix-number-of-annotations | Jeremy Benoist | 2016-10-09 | 11 | -11/+10 |
|\ | |||||
| * | Show number of annotations instead of nbAnnotations placeholder | Krzysztof Szafranek | 2016-10-09 | 11 | -11/+10 |
* | | Merge pull request #2405 from szafranek/cleanup-fix-invalid-html | Nicolas Lœuillet | 2016-10-09 | 3 | -3/+3 |
|\ \ | |/ |/| | |||||
| * | Fix few invalid HTML tags | Krzysztof Szafranek | 2016-10-09 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #2402 from wallabag/remove-1x-changelog | Jeremy Benoist | 2016-10-08 | 1 | -1086/+767 |
|\ | |||||
| * | Removed 1.x stuff in CHANGELOG | Nicolas Lœuillet | 2016-10-08 | 1 | -1086/+767 |
|/ | |||||
* | Merge pull request #2351 from wallabag/fix-api-client-deletion | Nicolas Lœuillet | 2016-10-08 | 5 | -4/+45 |
|\ | |||||
| * | Ensure access_token are removed | Jeremy Benoist | 2016-10-08 | 5 | -4/+40 |
| * | Changed relation between API client and refresh token | Nicolas Lœuillet | 2016-10-03 | 1 | -0/+5 |
* | | Merge pull request #2393 from wallabag/api-urls-exist | Nicolas Lœuillet | 2016-10-08 | 2 | -1/+37 |
|\ \ | |||||
| * | | Ability to check multiple urls in API | Jeremy Benoist | 2016-10-07 | 2 | -1/+37 |
* | | | Merge pull request #2397 from wallabag/api-orphan-tags | Nicolas Lœuillet | 2016-10-08 | 6 | -27/+78 |
|\ \ \ | |||||
| * | | | Ensure orphan tag are remove in API | Jeremy Benoist | 2016-10-07 | 6 | -27/+78 |
* | | | | Merge pull request #2399 from wallabag/use-locale-for-config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use default locale for user config | Jeremy Benoist | 2016-10-08 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2400 from wallabag/doc-env-prod | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Set env to prod in documentation | Jeremy Benoist | 2016-10-08 | 9 | -51/+51 |
|/ / / | |||||
* | | | Merge pull request #2396 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-07 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2395 from wallabag/socket-connection | Nicolas Lœuillet | 2016-10-07 | 3 | -1/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add ability to use socket | Jeremy Benoist | 2016-10-07 | 3 | -1/+6 |
|/ / | |||||
* | | Merge pull request #2386 from wallabag/update-changelog | Nicolas Lœuillet | 2016-10-07 | 2 | -240/+2438 |
|\ \ | |||||
| * | | Update release process | Nicolas Lœuillet | 2016-10-07 | 1 | -0/+1 |
| * | | Changed Changelog by using github-changelog-generator from @skywinder | Nicolas Lœuillet | 2016-10-07 | 1 | -240/+2437 |
* | | | Merge pull request #2389 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 |
|\ \ \ | |||||
| * | | | Added default picture if preview picture is null | Nicolas Lœuillet | 2016-10-07 | 2 | -0/+3 |
* | | | | Merge pull request #2388 from wallabag/fix-2factor-user-admin | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fixed two-factor checkbox display in user admin panel | Nicolas Lœuillet | 2016-10-07 | 2 | -2/+2 |
* | | | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfig | Jeremy Benoist | 2016-10-07 | 2 | -6/+30 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 1 | -2/+2 |
| * | | | | Added link to fivefilters website | Nicolas Lœuillet | 2016-10-07 | 2 | -5/+5 |
| * | | | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 2 | -3/+3 |
| * | | | | Added documentation about siteconfig fix | Nicolas Lœuillet | 2016-10-07 | 2 | -6/+30 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2383 from wallabag/add-info-publich-articles | Nicolas Lœuillet | 2016-10-07 | 13 | -3/+35 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Added test for OpenGraph | Nicolas Lœuillet | 2016-10-07 | 1 | -1/+4 |
| * | | Fixed review | Nicolas Lœuillet | 2016-10-07 | 12 | -21/+21 |
| * | | Added OpenGraph support for public articles | Nicolas Lœuillet | 2016-10-07 | 12 | -2/+31 |
* | | | Merge pull request #2332 from wallabag/tags-export | Jeremy Benoist | 2016-10-07 | 17 | -42/+84 |
|\ \ \ | |/ / |/| | |