aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | Releasing documentation
| | * 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 document
| | * 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
|\ \ | | | | | | minor typofix again
| * | fixing previous stuff and moregoofy-bz2016-03-011-1/+1
| | |
| * | minor fixgoofy-bz2016-03-011-12/+12
| | | | | | | | | adding non-breaking spaces here and there + small piece of translation and relevant French link
| * | 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)
| * | | 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:
| * | | 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 quotes
| * | minor typofix + missing quotesgoofy-bz2016-02-291-6/+6
|/ / | | | | Added quotes to be reviewed
* | Merge pull request #1736 from wallabag/v2-update-capistrano-gemJeremy Benoist2016-02-292-15/+10
|\ \ | | | | | | Update Capistrano libraries with last versions
| * | 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
|\ \ | |/ |/| Remove extra definition
| * Skipping all Posgres test for wallabag:installJeremy Benoist2016-02-292-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already faced this problem but we are facing it again. https://github.com/wallabag/wallabag/commit/d502762598db68ec822078642df8f6a8214202f7 It seems we can drop a database properly using wallabag:install. The server log keep saying: ERROR: source database "template1" is being accessed by other users DETAIL: There is 1 other session using the database. STATEMENT: CREATE DATABASE "wallabag_test" Which means, it can't remove the database wallabag_test because one other person is using it.
| * Defining Github token is now uselessJeremy Benoist2016-02-291-1/+0
| | | | | | | | We are using it differently with .composer-auth.json file
| * Fix postgres database creationJeremy Benoist2016-02-291-1/+1
| | | | | | | | Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed
| * Remove extra definitionJeremy Benoist2016-02-291-5/+0
|/ | | | Since Symfony 3.0.3 has been released
* Merge pull request #1732 from mjjzf/v2Jeremy Benoist2016-02-285-0/+165
|\ | | | | Adding Danish translations to Wallabag v2
| * 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
|\ | | | | Fix: #1703: authentication for PR by external contributors
| * 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
|\ | | | | V2 annotator comments
| * 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
| | | | | | | | So that the "article" tag is loaded before
| * Add annotator in baggy themeNicolas Lœuillet2016-02-2612-10/+71
| | | | | | | | + Documentation about annotations
| * Comment work with annotator v2Thomas Citharel2016-02-2620-9/+828
|/ | | | | | - add missing annotator.js file and fix typo - edit & delete routes, started tests - basic tests
* Merge pull request #1728 from wallabag/v2-change-delete-tag-iconJeremy Benoist2016-02-261-1/+1
|\ | | | | Fix #1717: Change remove tag icon in entry view with material theme
| * 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 natural
| * Make English welcome message more naturalOlivier Mehani2016-02-257-9/+9
|/ | | | | | sed -i "s/Welcome on wallabag/Welcome to wallabag/" Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* Merge pull request #1712 from wallabag/v2-contributingJeremy Benoist2016-02-242-16/+15
|\ | | | | Fix #1711: Update CONTRIBUTING file
| * fixesNicolas Lœuillet2016-02-241-7/+3
| |
| * Update issue templateNicolas Lœuillet2016-02-231-4/+13
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 10:11:14 +0000