Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | changed error message | Nicolas Lœuillet | 2016-02-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added documentation about errors during fetching | Nicolas Lœuillet | 2016-02-22 | 5 | -0/+56 |
| | | | | |||||
| * | | | Display a human message when graby fails to fetch articles | Nicolas Lœuillet | 2016-02-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1715 from wallabag/v2-add-contributors-libraries | Jeremy Benoist | 2016-02-24 | 3 | -1/+263 |
|\ \ \ \ | |_|/ / |/| | | | Fix #1694 #1669 #1684: Add contributors and 3rd party libraries | ||||
| * | | | replace contributors with a link to github | Nicolas Lœuillet | 2016-02-23 | 2 | -127/+2 |
| | | | | |||||
| * | | | Add contributors and 3rd party libraries | Nicolas Lœuillet | 2016-02-23 | 3 | -1/+388 |
|/ / / | |||||
* | | | Merge pull request #1714 from wallabag/v2-install-admin | Nicolas Lœuillet | 2016-02-23 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Change wording for create a new user | ||||
| * | | Change wording for create a new user | Jeremy Benoist | 2016-02-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1683 from wallabag/v2-demo | Nicolas Lœuillet | 2016-02-22 | 7 | -6/+64 |
|\ \ | | | | | | | Demonstration mode to prevent password changes | ||||
| * | | Add tests | Jeremy Benoist | 2016-02-22 | 2 | -9/+35 |
| | | | |||||
| * | | Add translation | Jeremy Benoist | 2016-02-22 | 1 | -0/+1 |
| | | | |||||
| * | | Use internal config instead for demo | Jeremy Benoist | 2016-02-22 | 9 | -17/+25 |
| | | | |||||
| * | | add a username for demonstration mode | Nicolas Lœuillet | 2016-02-22 | 5 | -10/+14 |
| | | | |||||
| * | | change comment about demo parameter | Nicolas Lœuillet | 2016-02-22 | 4 | -4/+4 |
| | | | |||||
| * | | typo | Nicolas Lœuillet | 2016-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | Demonstration mode to prevent password changes | Nicolas Lœuillet | 2016-02-22 | 5 | -7/+26 |
| |/ | |||||
* | | Merge pull request #1701 from wallabag/v2-maintenance | Jeremy Benoist | 2016-02-22 | 7 | -1/+80 |
|\ \ | | | | | | | Fix #1351: add maintenance mode | ||||
| * | | documentation for maintenance mode | Nicolas Lœuillet | 2016-02-22 | 4 | -0/+67 |
| | | | |||||
| * | | Use a tag for lexik/maintenance-bundle | Jeremy Benoist | 2016-02-22 | 1 | -1/+1 |
| | | | |||||
| * | | Fix #1351: add maintenance mode | Nicolas Lœuillet | 2016-02-22 | 3 | -1/+13 |
| |/ | |||||
* | | Merge pull request #1709 from wallabag/v2-typo-doc-fr | Jeremy Benoist | 2016-02-22 | 2 | -2/+2 |
|\ \ | |/ |/| | Fix #1708: typos in french documentation | ||||
| * | typos in french documentation | Nicolas Lœuillet | 2016-02-22 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1702 from wallabag/v2-piwik | Jeremy Benoist | 2016-02-22 | 7 | -1/+48 |
|\ | | | | | Added Piwik implementation | ||||
| * | Use a different way to use piwik | Jeremy Benoist | 2016-02-22 | 3 | -18/+5 |
| | | |||||
| * | Fix #1137: implemented Piwik | Nicolas Lœuillet | 2016-02-19 | 8 | -1/+61 |
| | | |||||
* | | Merge pull request #1707 from wallabag/nicosomb-patch-1 | Nicolas Lœuillet | 2016-02-21 | 1 | -2/+2 |
|\ \ | | | | | | | typo in french documentation |