Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1740 from goofy-bz/patch-6 | Nicolas Lœuillet | 2016-03-01 | 1 | -15/+15 |
|\ | | | | | minor typofix again | ||||
| * | fixing previous stuff and more | goofy-bz | 2016-03-01 | 1 | -1/+1 |
| | | |||||
| * | minor fix | goofy-bz | 2016-03-01 | 1 | -12/+12 |
| | | | | | | adding non-breaking spaces here and there + small piece of translation and relevant French link | ||||
| * | minor typofix again | goofy-bz | 2016-02-29 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #1742 from wallabag/v2-issue-template-package | Jeremy Benoist | 2016-03-01 | 1 | -0/+1 |
|\ \ | | | | | | | Add the way to install (package or composer) | ||||
| * | | Add the way to install (package or composer) | Nicolas Lœuillet | 2016-03-01 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #1738 from wallabag/v2-prepare-beta1 | Jeremy Benoist | 2016-03-01 | 5 | -5/+5 |
|\ \ | | | | | | | Prepare wallabag for first beta :rocket: | ||||
| * | | Prepare wallabag for first beta :rocket: | Nicolas Lœuillet | 2016-02-29 | 5 | -5/+5 |
| |/ | |||||
* | | Merge pull request #1739 from goofy-bz/patch-5 | Nicolas Lœuillet | 2016-03-01 | 1 | -6/+6 |
|\ \ | |/ |/| | minor typofix + missing quotes | ||||
| * | minor typofix + missing quotes | goofy-bz | 2016-02-29 | 1 | -6/+6 |
|/ | | | Added quotes to be reviewed | ||||
* | Merge pull request #1736 from wallabag/v2-update-capistrano-gem | Jeremy Benoist | 2016-02-29 | 2 | -15/+10 |
|\ | | | | | Update Capistrano libraries with last versions | ||||
| * | Update Capistrano libraries with last versions | Nicolas Lœuillet | 2016-02-29 | 2 | -15/+10 |
|/ | |||||
* | Merge pull request #1734 from wallabag/v2-todo | Nicolas Lœuillet | 2016-02-29 | 4 | -28/+20 |
|\ | | | | | Remove extra definition | ||||
| * | Skipping all Posgres test for wallabag:install | Jeremy Benoist | 2016-02-29 | 2 | -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 useless | Jeremy Benoist | 2016-02-29 | 1 | -1/+0 |
| | | | | | | | | We are using it differently with .composer-auth.json file | ||||
| * | Fix postgres database creation | Jeremy Benoist | 2016-02-29 | 1 | -1/+1 |
| | | | | | | | | Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed | ||||
| * | Remove extra definition | Jeremy Benoist | 2016-02-29 | 1 | -5/+0 |
|/ | | | | Since Symfony 3.0.3 has been released | ||||
* | Merge pull request #1732 from mjjzf/v2 | Jeremy Benoist | 2016-02-28 | 5 | -0/+165 |
|\ | | | | | Adding Danish translations to Wallabag v2 | ||||
| * | added newline | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -1/+2 |
| | | |||||
| * | Fixed indentation issue | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -1/+1 |
| | | |||||
| * | config.yml edit to include Danish | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -0/+1 |
| | | |||||
| * | Adding Danish translations to Wallabag v2 | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 4 | -0/+163 |
|/ | |||||
* | Merge pull request #1731 from wallabag/v2-fix-travis-auth | Jeremy Benoist | 2016-02-27 | 2 | -0/+10 |
|\ | | | | | Fix: #1703: authentication for PR by external contributors | ||||
| * | Replace token by a no scope one | Nicolas Lœuillet | 2016-02-27 | 1 | -1/+1 |
| | | |||||
| * | Fix authentication for PR by external contributors | Nicolas Lœuillet | 2016-02-27 | 2 | -0/+10 |
|/ | |||||
* | Merge pull request #1653 from wallabag/v2-annotator-comments | Nicolas Lœuillet | 2016-02-26 | 27 | -13/+891 |
|\ | | | | | V2 annotator comments | ||||
| * | Regenerate Annotator with idAnnotation instead of idComment | Nicolas Lœuillet | 2016-02-26 | 1 | -17/+15 |
| | | |||||
| * | Rename CommentBundle with AnnotationBundle | Nicolas Lœuillet | 2016-02-26 | 22 | -263/+260 |
| | | |||||
| * | changed french translation from commentaire to annotation | Thomas Citharel | 2016-02-26 | 1 | -1/+1 |
| | | |||||
| * | display how much comments there are for an entry | Thomas Citharel | 2016-02-26 | 3 | -1/+5 |
| | | |||||
| * | Move annotatorjs to the bottom of the body | Thomas Citharel | 2016-02-26 | 2 | -24/+23 |
| | | | | | | | | So that the "article" tag is loaded before | ||||
| * | Add annotator in baggy theme | Nicolas Lœuillet | 2016-02-26 | 12 | -10/+71 |
| | | | | | | | | + Documentation about annotations | ||||
| * | Comment work with annotator v2 | Thomas Citharel | 2016-02-26 | 20 | -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-icon | Jeremy Benoist | 2016-02-26 | 1 | -1/+1 |
|\ | | | | | Fix #1717: Change remove tag icon in entry view with material theme | ||||
| * | Change remove tag icon in entry view with material theme | Nicolas Lœuillet | 2016-02-26 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1723 from shtrom/v2-lang-fix | Jeremy Benoist | 2016-02-25 | 7 | -9/+9 |
|\ | | | | | Make English welcome message more natural | ||||
| * | Make English welcome message more natural | Olivier Mehani | 2016-02-25 | 7 | -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-contributing | Jeremy Benoist | 2016-02-24 | 2 | -16/+15 |
|\ | | | | | Fix #1711: Update CONTRIBUTING file | ||||
| * | fixes | Nicolas Lœuillet | 2016-02-24 | 1 | -7/+3 |
| | | |||||
| * | Update issue template | Nicolas Lœuillet | 2016-02-23 | 1 | -4/+13 |
| | | |||||
| * | Update CONTRIBUTING file | Nicolas Lœuillet | 2016-02-22 | 1 | -9/+3 |
| | | |||||
* | | Fix wrong variable name | Jeremy Benoist | 2016-02-24 | 1 | -1/+1 |
| | | | | | | | | > The variable $requirement does not exist. | ||||
* | | Merge pull request #1716 from wallabag/v2-enhance-requirements-installation | Jeremy Benoist | 2016-02-24 | 3 | -15/+44 |
|\ \ | | | | | | | Fix #1603: Enhance requirements in InstallCommand | ||||
| * | | Remove gettext & lowerize | Jeremy Benoist | 2016-02-24 | 1 | -4/+3 |
| | | | |||||
| * | | Exclude v1 branches from Travis | Jeremy Benoist | 2016-02-24 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | Instead of allowing only v2. Branches which didn't target v2 BUT related to v2 weren't tested on Travis | ||||
| * | | Add namespace prefix for psr-4 | Jeremy Benoist | 2016-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | > Defining autoload.psr-4 with an empty namespace prefix is a bad idea for performance | ||||
| * | | remove unused functions & clean composer.json | Thomas Citharel | 2016-02-23 | 2 | -19/+16 |
| | | | |||||
| * | | add composer extensions check & function_exists checks | Thomas Citharel | 2016-02-23 | 2 | -8/+40 |
| | | | |||||
| * | | Enhance requirements in InstallCommand | Nicolas Lœuillet | 2016-02-23 | 1 | -20/+19 |
| | | | |||||
* | | | Merge pull request #1710 from wallabag/v2-message-graby-fails | Jeremy Benoist | 2016-02-24 | 6 | -1/+57 |
|\ \ \ | | | | | | | | | Fix #811: Display a human message when graby fails to fetch articles |