aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Add version in APIVincent2016-03-072-0/+14
* Update filters picture in documentationNicolas Lœuillet2016-03-041-0/+0
* Merge pull request #1750 from wallabag/v2-quickstart-documentationJeremy Benoist2016-03-0412-18/+143
|\
| * update pictureNicolas Lœuillet2016-03-041-0/+0
| * Documentation about filters (and some fixes in french documentationNicolas Lœuillet2016-03-0310-13/+108
| * Add new links in quickstartNicolas Lœuillet2016-03-032-5/+35
* | Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-readNicolas Lœuillet2016-03-0416-8/+359
|\ \
| * | Adding testJeremy Benoist2016-03-0410-63/+219
| * | cs & tests for wllbg v1 importThomas Citharel2016-03-037-5/+122
| * | french translation & pocketThomas Citharel2016-03-035-3/+54
| * | Mark all imported articles as readThomas Citharel2016-03-036-2/+29
| |/
* | Merge pull request #1754 from wallabag/v2-api-new-properties-lightNicolas Lœuillet2016-03-042-0/+31
|\ \
| * | Remove 'content' from APIJeremy Benoist2016-03-042-22/+0
| * | use booleans instead of emptyThomas Citharel2016-03-041-4/+4
| * | add more properties for entries #1634Thomas Citharel2016-03-042-0/+53
|/ /
* | Merge pull request #1753 from Horgix/v2-typo-doc-enNicolas Lœuillet2016-03-041-1/+1
|\ \ | |/ |/|
| * Doc: fix typo in php-hash ext nameAlexis 'Horgix' Chotard2016-03-041-1/+1
|/
* Merge pull request #1745 from benages/v2Nicolas Lœuillet2016-03-025-0/+277
|\
| * Spanish translationJuanjo Benages2016-03-011-0/+1
| * Spanish translationJuanjo Benages2016-03-011-0/+2
| * Spanish translationJuanjo Benages2016-03-011-0/+29
| * Spanish translationJuanjo Benages2016-03-011-0/+3
| * Spanish translationJuanjo Benages2016-03-011-131/+131
| * Merge remote-tracking branch 'upstream/v2' into v2Juanjo Benages2016-03-012-0/+68
| |\ | |/ |/|
* | Merge pull request #1743 from wallabag/v2-releasing-documentationJeremy Benoist2016-03-012-9/+40
|\ \
| * | Add steps in RELEASE_PROCESSNicolas Lœuillet2016-03-012-54/+39
| * | Releasing documentationNicolas Lœuillet2016-03-012-0/+46
|/ /
* | Merge pull request #1615 from bdunogier/release_process_docNicolas Lœuillet2016-03-011-0/+37
|\ \
| * | Added RELEASE_PROCESS documentBertrand Dunogier2016-02-271-0/+37
| | * Start of the spanish translationJuanjo Benages2016-03-011-0/+242
| |/ |/|
* | Merge pull request #1740 from goofy-bz/patch-6Nicolas Lœuillet2016-03-011-15/+15
|\ \
| * | fixing previous stuff and moregoofy-bz2016-03-011-1/+1
| * | minor fixgoofy-bz2016-03-011-12/+12
| * | minor typofix againgoofy-bz2016-02-291-6/+6
* | | Merge pull request #1742 from wallabag/v2-issue-template-packageJeremy Benoist2016-03-011-0/+1
|\ \ \
| * | | Add the way to install (package or composer)Nicolas Lœuillet2016-03-011-0/+1
|/ / /
* | | Merge pull request #1738 from wallabag/v2-prepare-beta1Jeremy Benoist2016-03-015-5/+5
|\ \ \
| * | | Prepare wallabag for first beta :rocket:Nicolas Lœuillet2016-02-295-5/+5
| |/ /
* | | Merge pull request #1739 from goofy-bz/patch-5Nicolas Lœuillet2016-03-011-6/+6
|\ \ \ | |/ / |/| |
| * | minor typofix + missing quotesgoofy-bz2016-02-291-6/+6
|/ /
* | Merge pull request #1736 from wallabag/v2-update-capistrano-gemJeremy Benoist2016-02-292-15/+10
|\ \
| * | Update Capistrano libraries with last versionsNicolas Lœuillet2016-02-292-15/+10
|/ /
* | Merge pull request #1734 from wallabag/v2-todoNicolas Lœuillet2016-02-294-28/+20
|\ \ | |/ |/|
| * Skipping all Posgres test for wallabag:installJeremy Benoist2016-02-292-21/+19
| * Defining Github token is now uselessJeremy Benoist2016-02-291-1/+0
| * Fix postgres database creationJeremy Benoist2016-02-291-1/+1
| * Remove extra definitionJeremy Benoist2016-02-291-5/+0
|/
* Merge pull request #1732 from mjjzf/v2Jeremy Benoist2016-02-285-0/+165
|\
| * added newlineMorten Juhl-Johansen Zölde-Fejér2016-02-271-1/+2
| * Fixed indentation issueMorten Juhl-Johansen Zölde-Fejér2016-02-271-1/+1