Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fix tag test | Jeremy Benoist | 2016-10-07 | 3 | -13/+16 | |
| * | | Fix bad translation key | Jeremy Benoist | 2016-10-07 | 11 | -11/+11 | |
| * | | Fix relations export for Entry | Jeremy Benoist | 2016-10-07 | 5 | -19/+58 | |
|/ / | ||||||
* | | Merge pull request #2377 from wallabag/fix-exists-api | Thomas Citharel | 2016-10-05 | 2 | -1/+8 | |
|\ \ | ||||||
| * | | Fix typo & add test | Jeremy Benoist | 2016-10-05 | 2 | -1/+8 | |
| * | | Fix exists API call | Thomas Citharel | 2016-10-05 | 1 | -1/+1 | |
* | | | Merge pull request #2374 from wallabag/clickable-tags | Jeremy Benoist | 2016-10-05 | 10 | -14/+40 | |
|\ \ \ | ||||||
| * | | | better tags on material | Thomas Citharel | 2016-10-05 | 5 | -7/+17 | |
| * | | | better tags on baggy | Thomas Citharel | 2016-10-04 | 5 | -7/+23 | |
* | | | | Merge pull request #2375 from wallabag/upgrade-nodejs | Thomas Citharel | 2016-10-05 | 1 | -1/+1 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | try to reduce assets build npm connection failing by updating nodejs | Thomas Citharel | 2016-10-05 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge pull request #2363 from wallabag/clean-composer | Nicolas Lœuillet | 2016-10-04 | 1 | -4/+1 | |
|\ \ \ | ||||||
| * | | | Remove mouf/nodejs-installer from composer | Jeremy Benoist | 2016-10-04 | 1 | -4/+1 | |
|/ / / | ||||||
* / / | Update md5 hash for package | Nicolas Lœuillet | 2016-10-04 | 5 | -5/+5 | |
|/ / |