aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Update CONTRIBUTING fileNicolas Lœuillet2016-02-221-9/+3
| |
* | Fix wrong variable nameJeremy Benoist2016-02-241-1/+1
| | | | | | | | > The variable $requirement does not exist.
* | Merge pull request #1716 from wallabag/v2-enhance-requirements-installationJeremy Benoist2016-02-243-15/+44
|\ \ | | | | | | Fix #1603: Enhance requirements in InstallCommand
| * | Remove gettext & lowerizeJeremy Benoist2016-02-241-4/+3
| | |
| * | Exclude v1 branches from TravisJeremy Benoist2016-02-241-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-4Jeremy Benoist2016-02-241-1/+1
| | | | | | | | | | | | > Defining autoload.psr-4 with an empty namespace prefix is a bad idea for performance
| * | remove unused functions & clean composer.jsonThomas Citharel2016-02-232-19/+16
| | |
| * | add composer extensions check & function_exists checksThomas Citharel2016-02-232-8/+40
| | |
| * | Enhance requirements in InstallCommandNicolas Lœuillet2016-02-231-20/+19
| | |
* | | Merge pull request #1710 from wallabag/v2-message-graby-failsJeremy Benoist2016-02-246-1/+57
|\ \ \ | | | | | | | | Fix #811: Display a human message when graby fails to fetch articles
| * | | changed error messageNicolas Lœuillet2016-02-221-1/+1
| | | |
| * | | Added documentation about errors during fetchingNicolas Lœuillet2016-02-225-0/+56
| | | |
| * | | Display a human message when graby fails to fetch articlesNicolas Lœuillet2016-02-221-1/+1
| | | |
* | | | Merge pull request #1715 from wallabag/v2-add-contributors-librariesJeremy Benoist2016-02-243-1/+263
|\ \ \ \ | |_|/ / |/| | | Fix #1694 #1669 #1684: Add contributors and 3rd party libraries
| * | | replace contributors with a link to githubNicolas Lœuillet2016-02-232-127/+2
| | | |
| * | | Add contributors and 3rd party librariesNicolas Lœuillet2016-02-233-1/+388
|/ / /
* | | Merge pull request #1714 from wallabag/v2-install-adminNicolas Lœuillet2016-02-231-1/+1
|\ \ \ | |_|/ |/| | Change wording for create a new user
| * | Change wording for create a new userJeremy Benoist2016-02-231-1/+1
|/ /
* | Merge pull request #1683 from wallabag/v2-demoNicolas Lœuillet2016-02-227-6/+64
|\ \ | | | | | | Demonstration mode to prevent password changes
| * | Add testsJeremy Benoist2016-02-222-9/+35
| | |
| * | Add translationJeremy Benoist2016-02-221-0/+1
| | |
| * | Use internal config instead for demoJeremy Benoist2016-02-229-17/+25
| | |
| * | add a username for demonstration modeNicolas Lœuillet2016-02-225-10/+14
| | |
| * | change comment about demo parameterNicolas Lœuillet2016-02-224-4/+4
| | |
| * | typoNicolas Lœuillet2016-02-221-1/+1
| | |
| * | Demonstration mode to prevent password changesNicolas Lœuillet2016-02-225-7/+26
| |/
* | Merge pull request #1701 from wallabag/v2-maintenanceJeremy Benoist2016-02-227-1/+80
|\ \ | | | | | | Fix #1351: add maintenance mode
| * | documentation for maintenance modeNicolas Lœuillet2016-02-224-0/+67
| | |
| * | Use a tag for lexik/maintenance-bundleJeremy Benoist2016-02-221-1/+1
| | |
| * | Fix #1351: add maintenance modeNicolas Lœuillet2016-02-223-1/+13
| |/
* | Merge pull request #1709 from wallabag/v2-typo-doc-frJeremy Benoist2016-02-222-2/+2
|\ \ | |/ |/| Fix #1708: typos in french documentation
| * typos in french documentationNicolas Lœuillet2016-02-222-2/+2
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 07:14:26 +0000