aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Show number of annotations instead of nbAnnotations placeholderKrzysztof Szafranek2016-10-0911-11/+10
* Merge pull request #2402 from wallabag/remove-1x-changelogJeremy Benoist2016-10-081-1086/+767
|\
| * Removed 1.x stuff in CHANGELOGNicolas Lœuillet2016-10-081-1086/+767
|/
* Merge pull request #2351 from wallabag/fix-api-client-deletionNicolas Lœuillet2016-10-085-4/+45
|\
| * Ensure access_token are removedJeremy Benoist2016-10-085-4/+40
| * Changed relation between API client and refresh tokenNicolas Lœuillet2016-10-031-0/+5
* | Merge pull request #2393 from wallabag/api-urls-existNicolas Lœuillet2016-10-082-1/+37
|\ \
| * | Ability to check multiple urls in APIJeremy Benoist2016-10-072-1/+37
* | | Merge pull request #2397 from wallabag/api-orphan-tagsNicolas Lœuillet2016-10-086-27/+78
|\ \ \
| * | | Ensure orphan tag are remove in APIJeremy Benoist2016-10-076-27/+78
* | | | Merge pull request #2399 from wallabag/use-locale-for-configJeremy Benoist2016-10-081-1/+1
|\ \ \ \
| * | | | Use default locale for user configJeremy Benoist2016-10-081-1/+1
| |/ / /
* | | | Merge pull request #2400 from wallabag/doc-env-prodJeremy Benoist2016-10-089-51/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Set env to prod in documentationJeremy Benoist2016-10-089-51/+51
|/ / /
* | | Merge pull request #2396 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-071-1/+1
|\ \ \
| * | | Update messages.pl.ymlMateusz Rumiński2016-10-071-1/+1
| |/ /
* | | Merge pull request #2395 from wallabag/socket-connectionNicolas Lœuillet2016-10-073-1/+6
|\ \ \ | |/ / |/| |
| * | Add ability to use socketJeremy Benoist2016-10-073-1/+6
|/ /
* | Merge pull request #2386 from wallabag/update-changelogNicolas Lœuillet2016-10-072-240/+2438
|\ \
| * | Update release processNicolas Lœuillet2016-10-071-0/+1
| * | Changed Changelog by using github-changelog-generator from @skywinderNicolas Lœuillet2016-10-071-240/+2437
* | | Merge pull request #2389 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-072-0/+3
|\ \ \
| * | | Added default picture if preview picture is nullNicolas Lœuillet2016-10-072-0/+3
* | | | Merge pull request #2388 from wallabag/fix-2factor-user-adminNicolas Lœuillet2016-10-072-2/+2
|\ \ \ \
| * | | | Fixed two-factor checkbox display in user admin panelNicolas Lœuillet2016-10-072-2/+2
* | | | | Merge pull request #2385 from wallabag/add-doc-about-siteconfigJeremy Benoist2016-10-072-6/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed reviewNicolas Lœuillet2016-10-071-2/+2
| * | | | Added link to fivefilters websiteNicolas Lœuillet2016-10-072-5/+5
| * | | | Fixed reviewNicolas Lœuillet2016-10-072-3/+3
| * | | | Added documentation about siteconfig fixNicolas Lœuillet2016-10-072-6/+30
| | |/ / | |/| |
* | | | Merge pull request #2383 from wallabag/add-info-publich-articlesNicolas Lœuillet2016-10-0713-3/+35
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Added test for OpenGraphNicolas Lœuillet2016-10-071-1/+4
| * | Fixed reviewNicolas Lœuillet2016-10-0712-21/+21
| * | Added OpenGraph support for public articlesNicolas Lœuillet2016-10-0712-2/+31
* | | Merge pull request #2332 from wallabag/tags-exportJeremy Benoist2016-10-0717-42/+84
|\ \ \ | |/ / |/| |
| * | Fix tag testJeremy Benoist2016-10-073-13/+16
| * | Fix bad translation keyJeremy Benoist2016-10-0711-11/+11
| * | Fix relations export for EntryJeremy Benoist2016-10-075-19/+58
|/ /
* | Merge pull request #2377 from wallabag/fix-exists-apiThomas Citharel2016-10-052-1/+8
|\ \
| * | Fix typo & add testJeremy Benoist2016-10-052-1/+8
| * | Fix exists API callThomas Citharel2016-10-051-1/+1
* | | Merge pull request #2374 from wallabag/clickable-tagsJeremy Benoist2016-10-0510-14/+40
|\ \ \
| * | | better tags on materialThomas Citharel2016-10-055-7/+17
| * | | better tags on baggyThomas Citharel2016-10-045-7/+23
* | | | Merge pull request #2375 from wallabag/upgrade-nodejsThomas Citharel2016-10-051-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | try to reduce assets build npm connection failing by updating nodejsThomas Citharel2016-10-051-1/+1
| |/ /
* | | Merge pull request #2363 from wallabag/clean-composerNicolas Lœuillet2016-10-041-4/+1
|\ \ \
| * | | Remove mouf/nodejs-installer from composerJeremy Benoist2016-10-041-4/+1
|/ / /
* / / Update md5 hash for packageNicolas Lœuillet2016-10-045-5/+5
|/ /
* | Merge pull request #2349 from wallabag/prepare-211Nicolas Lœuillet2016-10-049-13/+29
|\ \