Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-05-09 | 5 | -5/+5 |
|\ | |||||
| * | Small typo in documentation fix #3061 | Maxime Marinel | 2017-05-02 | 5 | -5/+5 |
| | | |||||
* | | Merge pull request #3022 from wallabag/webpack | Thomas Citharel | 2017-05-09 | 2 | -0/+66 |
|\ \ | | | | | | | Adds Webpack support and remove Grunt | ||||
| * | | Adds Webpack support and removes the use for Grunt | Thomas Citharel | 2017-05-04 | 2 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> use scss Signed-off-by: Thomas Citharel <tcit@tcit.fr> fix build, add babel, fix annotations fixes (and improvements !) for baggy add live reload & environments & eslint & theme fixes | ||||
* | | | Merge pull request #2920 from wallabag/cleanduplicatescommand | Jérémy Benoist | 2017-05-05 | 2 | -0/+60 |
|\ \ \ | | | | | | | | | Clean Duplicates Command | ||||
| * | | | Add docs for cli commands | Thomas Citharel | 2017-05-01 | 2 | -0/+60 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | | Use username to import | Thomas Citharel | 2017-05-04 | 1 | -5/+10 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> add docs Signed-off-by: Thomas Citharel <tcit@tcit.fr> use username as default Signed-off-by: Thomas Citharel <tcit@tcit.fr> rename user to username typo Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Updated documentation version | Nicolas Lœuillet | 2017-05-03 | 4 | -8/+8 |
| | | | |||||
* | | | Fixed old links in documentation | Nicolas Lœuillet | 2017-05-03 | 12 | -18/+18 |
| | | | |||||
* | | | Merge pull request #3047 from wallabag/add-notmatches-operator | Nicolas Lœuillet | 2017-05-03 | 3 | -26/+29 |
|\ \ \ | |/ / |/| | | Added notmatches operator for tagging rule | ||||
| * | | Added notmatches operator for tagging rule | Nicolas Lœuillet | 2017-04-20 | 3 | -26/+29 |
| | | | |||||
* | | | Fix IT translation #3057 | Raphaël Flores | 2017-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typos. Fix #3057 | Raphaël Flores | 2017-04-25 | 2 | -2/+2 |
| | | | |||||
* | | | Fix documentation for DE/IT/FR language, even if not sure for ED/IT. Fix #3057. | Raphaël Flores | 2017-04-25 | 3 | -6/+6 |
| | | | |||||
* | | | Remove 'fr' from Firefox extension URL | Raphaël Flores | 2017-04-25 | 1 | -1/+1 |
| | | | |||||
* | | | Update Firefox extension and Android links | Raphaël Flores | 2017-04-25 | 1 | -3/+3 |
|/ / | | | | | Use up-to-date Firefox extension and add F-Droid link for Android app. | ||||
* | | Merge pull request #3000 from cloudron-io/master | Nicolas Lœuillet | 2017-03-29 | 4 | -9/+40 |
|\ \ | | | | | | | Add Cloudron as installation method | ||||
| * | | Added :de: translation for Cloudron | Johannes Zellner | 2017-03-29 | 1 | -4/+4 |
| | | | |||||
| * | | Added :fr: and :it: translations for Cloudron | Nicolas Lœuillet | 2017-03-29 | 4 | -11/+34 |
| | | | |||||
| * | | Add Cloudron as installation method | Johannes Zellner | 2017-03-20 | 1 | -0/+8 |
| | | | |||||
* | | | Scuttle sharing | FrenchHope | 2017-03-28 | 4 | -0/+4 |
| | | | |||||
* | | | Merge pull request #2861 from wallabag/2.3-droping-5.5 | Jérémy Benoist | 2017-03-28 | 3 | -3/+3 |
|\ \ \ | |_|/ |/| | | Dropping PHP 5.5 | ||||
| * | | Updated requirements in documentation | Nicolas Lœuillet | 2017-03-28 | 3 | -3/+3 |
| | | | |||||
* | | | Merge pull request #2985 from etiess/patch-2 | Nicolas Lœuillet | 2017-03-23 | 1 | -3/+12 |
|\ \ \ | |_|/ |/| | | Update paywall.rst (more details and clear cache) | ||||
| * | | Update paywall.rst (more details and clear cache) | etiess | 2017-02-22 | 1 | -3/+12 |
| | | | |||||
* | | | Merge pull request #2971 from etiess/patch-3 | Jérémy Benoist | 2017-03-09 | 1 | -3/+12 |
|\ \ \ | | | | | | | | | Update paywall.rst (EN) with details + clear cache | ||||
| * | | | Update paywall.rst (EN) with details + clear cache | etiess | 2017-02-23 | 1 | -3/+12 |
| |/ / | |||||
* | | | Added german and italian translation | Nicolas Lœuillet | 2017-02-28 | 2 | -0/+12 |
| | | | |||||
* | | | Activate 'rewrite' mod of Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 |
| | | | |||||
* | | | Ajout du mod 'rewrite' de Apache | Quentin THEURET | 2017-02-23 | 1 | -0/+6 |
|/ / | |||||
* | | Alert that 2FA must be authorized in app/config/parameters.yml | Nicolas Frandeboeuf | 2017-02-20 | 4 | -9/+14 |
| | | |||||
* | | Remove word repetition from german translation | Julian Oster | 2017-02-17 | 1 | -1/+1 |
| | | | | | | see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434 | ||||
* | | Moved :it: documentation into it folder | Nicolas Lœuillet | 2017-02-17 | 24 | -13/+12 |
| | | |||||
* | | Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps | Nicolas Lœuillet | 2017-02-17 | 8 | -7/+48 |
|\ \ | | | | | | | Doc: translated mobile apps configuration in french | ||||
| * | | Some changes to :de: translation | Julian Oster | 2017-02-16 | 1 | -5/+4 |
| | | | |||||
| * | | add :de: doc user/configuring_mobile | Sven Fischer | 2017-02-15 | 1 | -9/+9 |
| | | | |||||
| * | | Doc: translated mobile apps configuration in french | Nicolas Lœuillet | 2017-02-14 | 8 | -7/+49 |
| | | | |||||
* | | | Merge pull request #2875 from kgaut/patch-3 | Nicolas Lœuillet | 2017-02-14 | 1 | -0/+18 |
|\ \ \ | | | | | | | | | Doc - information about Apache 2.4 | ||||
| * | | | Doc - informations about Apache 2.4 | Kevin Gautreau | 2017-02-14 | 1 | -0/+18 |
| | | | | |||||
* | | | | Merge pull request #2785 from matteocoder/patch-2 | Nicolas Lœuillet | 2017-02-14 | 1 | -66/+0 |
|\ \ \ \ | | | | | | | | | | | first_article.rst already inside articles.rst | ||||
| * | | | | first_article.rst already inside articles.rst | matteocoder | 2017-02-14 | 1 | -66/+0 |
| | |/ / | |/| | | | | | | The file is a duplicate of a section already present in articles.rst | ||||
* / | | | share.rst already integrated inside articles.rst | matteocoder | 2017-02-14 | 1 | -17/+0 |
|/ / / | | | | | | | The share.rst file is just a duplicate of a section already present in another file. | ||||
* | | | Merge pull request #2878 from matteocoder/wallabag-docs-ita | Nicolas Lœuillet | 2017-02-14 | 22 | -0/+1878 |
|\ \ \ | | | | | | | | | Italian documentation added | ||||
| * | | | Italian documentation added | matteocoder | 2017-02-14 | 22 | -0/+1878 |
| | | | | | | | | | | | | There are some missing links in various articles. Please let me know how I can fix this :) | ||||
* | | | | Merge pull request #2860 from wallabag/docs-update-3rd-party-apps | Nicolas Lœuillet | 2017-02-14 | 3 | -8/+11 |
|\ \ \ \ | |_|/ / |/| | | | docs 3rd party tools: update java wrapper, add cmd tool to add article | ||||
| * | | | docs: add 3rd party app wallabako for Kobo readers | Sven Fischer | 2017-02-14 | 3 | -2/+5 |
| | | | | |||||
| * | | | docs 3rd party tools: update java wrapper, add cmd tool to add article | Sven Fischer | 2017-02-11 | 3 | -6/+6 |
| | |/ | |/| | |||||
* / | | Add informations about Apache 2.4 | Kevin Gautreau | 2017-02-14 | 1 | -0/+17 |
|/ / | |||||
* | | Merge pull request #2788 from Zettt/master | Jeremy Benoist | 2017-02-05 | 1 | -0/+13 |
|\ \ | | | | | | | Documentation on how to configure mobile apps to work with wallabag.it | ||||
| * | | Added configuration documentation for mobile apps | Andreas Zeitler | 2017-02-05 | 1 | -0/+13 |
| |/ |