aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * config.yml edit to include DanishMorten Juhl-Johansen Zölde-Fejér2016-02-271-0/+1
| * Adding Danish translations to Wallabag v2Morten Juhl-Johansen Zölde-Fejér2016-02-274-0/+163
|/
* Merge pull request #1731 from wallabag/v2-fix-travis-authJeremy Benoist2016-02-272-0/+10
|\
| * Replace token by a no scope oneNicolas Lœuillet2016-02-271-1/+1
| * Fix authentication for PR by external contributorsNicolas Lœuillet2016-02-272-0/+10
|/
* Merge pull request #1653 from wallabag/v2-annotator-commentsNicolas Lœuillet2016-02-2627-13/+891
|\
| * Regenerate Annotator with idAnnotation instead of idCommentNicolas Lœuillet2016-02-261-17/+15
| * Rename CommentBundle with AnnotationBundleNicolas Lœuillet2016-02-2622-263/+260
| * changed french translation from commentaire to annotationThomas Citharel2016-02-261-1/+1
| * display how much comments there are for an entryThomas Citharel2016-02-263-1/+5
| * Move annotatorjs to the bottom of the bodyThomas Citharel2016-02-262-24/+23
| * Add annotator in baggy themeNicolas Lœuillet2016-02-2612-10/+71
| * Comment work with annotator v2Thomas Citharel2016-02-2620-9/+828
|/
* Merge pull request #1728 from wallabag/v2-change-delete-tag-iconJeremy Benoist2016-02-261-1/+1
|\
| * Change remove tag icon in entry view with material themeNicolas Lœuillet2016-02-261-1/+1
|/
* Merge pull request #1723 from shtrom/v2-lang-fixJeremy Benoist2016-02-257-9/+9
|\
| * Make English welcome message more naturalOlivier Mehani2016-02-257-9/+9
|/
* Merge pull request #1712 from wallabag/v2-contributingJeremy Benoist2016-02-242-16/+15
|\
| * fixesNicolas Lœuillet2016-02-241-7/+3
| * Update issue templateNicolas Lœuillet2016-02-231-4/+13
| * Update CONTRIBUTING fileNicolas Lœuillet2016-02-221-9/+3
* | Fix wrong variable nameJeremy Benoist2016-02-241-1/+1
* | Merge pull request #1716 from wallabag/v2-enhance-requirements-installationJeremy Benoist2016-02-243-15/+44
|\ \