Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix of localhost cookie related to nginx binding to 0.0.0.0 | Maryana Rozhankivska | 2014-03-21 | 1 | -2/+2 |
| | |||||
* | Merge pull request #581 from mariroz/fix-session-livetime | Nicolas Lœuillet | 2014-03-21 | 2 | -6/+5 |
|\ | | | | | fix of issue under nginx and php-fpm | ||||
| * | fix of issue under nginx and php-fpm | Maryana Rozhankivska | 2014-03-21 | 2 | -6/+5 |
| | | |||||
* | | Merge pull request #576 from mariroz/fix-session-livetime | Nicolas Lœuillet | 2014-03-19 | 1 | -1/+2 |
|\| | | | | | fix of _SESSION - indefined variable | ||||
| * | fix of _SESSION - indefined variable | Maryana Rozhankivska | 2014-03-19 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #572 from mariroz/fix-session-livetime | Nicolas Lœuillet | 2014-03-18 | 1 | -0/+3 |
|\ | | | | | fix of #115, server relater config value added | ||||
| * | fix of #115, server relater config value added | Maryana Rozhankivska | 2014-03-18 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #567 from mariroz/fix-session-livetime | Nicolas Lœuillet | 2014-03-17 | 3 | -7/+27 |
|\| | | | | | fix of #115 - stay connected and session livetime | ||||
| * | fix of #115 - stay connected and session livetime | Maryana Rozhankivska | 2014-03-17 | 3 | -7/+27 |
|/ | |||||
* | Merge pull request #566 from camporez/dev | Nicolas Lœuillet | 2014-03-17 | 1 | -1/+1 |
|\ | | | | | Update brazilian traslation title to "Português (Brasil)" | ||||
| * | Update brazilian traslation title to "Português (Brasil)" | camporez | 2014-03-16 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #563 from camporez/dev | Nicolas Lœuillet | 2014-03-16 | 2 | -7/+7 |
|\| | | | | | Update brazilian translation | ||||
| * | Correct README.md | camporez | 2014-03-16 | 1 | -1/+0 |
| | | |||||
| * | Update brazilian translation | camporez | 2014-03-15 | 2 | -7/+7 |
| | | |||||
| *-. | Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev | camporez | 2014-03-15 | 46 | -478/+4089 |
| |\ \ | |/ / |/| | | |||||
| | * | Merge pull request #481 from wallabag/dev1.5.2 | Nicolas Lœuillet | 2014-02-21 | 401 | -183/+31997 |
| | |\ | | | | | | | | | 1.5.2 | ||||
| | * \ | Merge pull request #469 from wallabag/dev | Nicolas Lœuillet | 2014-02-19 | 2 | -4/+4 |
| | |\ \ | | | | | | | | | | | version number 1.5.1 | ||||
| | * \ \ | Merge pull request #468 from wallabag/dev1.5.1 | Nicolas Lœuillet | 2014-02-19 | 9 | -16/+440 |
| | |\ \ \ | | | | | | | | | | | | | 1.5.1 | ||||
| | * \ \ \ | Merge pull request #450 from wallabag/dev1.5.0 | Nicolas Lœuillet | 2014-02-13 | 88 | -184/+3269 |
| | |\ \ \ \ | | | | | | | | | | | | | | | 1.5.0 | ||||
* | | | | | | | [fix] in RSS, link to original article | Nicolas Lœuillet | 2014-03-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | [add] remove import file in CACHE when import is over | Nicolas Lœuillet | 2014-03-14 | 1 | -0/+9 |
| | | | | | | | |||||
* | | | | | | | [fix] new import section in old themes #559 | Nicolas Lœuillet | 2014-03-14 | 2 | -9/+31 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #557 from mariroz/feature-add-link-inside-article-issue-505 | Nicolas Lœuillet | 2014-03-13 | 3 | -6/+34 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | saving link form now sends ajax request, article view is now justified (issue #554) | ||||
| * | | | | | | | saving link form now sends ajax request, article view is now justified | Maryana Rozhankivska | 2014-03-13 | 3 | -6/+34 |
|/ / / / / / / | |||||
* | | | | | | | feature #505 - it is now possible to add link from bagged article (TODO: ↵ | Maryana Rozhankivska | 2014-03-12 | 5 | -29/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | redev it to ajax action). Some enhancements to "save a link" popup div | ||||
* | | | | | | | Merge pull request #549 from ↵ | Nicolas Lœuillet | 2014-03-12 | 1 | -9/+12 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict fix of conflict of s shortcat and entering s in input fields | ||||
| * | | | | | | | fix of conflict of s shortcat and entering s in input fields | Maryana Rozhankivska | 2014-03-12 | 1 | -9/+12 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #544 from mariroz/feature-tags-autocomplete | Nicolas Lœuillet | 2014-03-10 | 27 | -26/+3226 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542 | ||||
| * | | | | | | | a lot of enhancements related to tags: tags list is now sorted, shows number ↵ | Maryana Rozhankivska | 2014-03-10 | 27 | -26/+3226 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of articles, autocomplete added according to #477, #542 | ||||
* | | | | | | | | Merge pull request #535 from bobmaerten/clarify-import-process | Nicolas Lœuillet | 2014-03-10 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Changed config section to clarify import process. | ||||
| * | | | | | | | Changed text to clarify import process. | Bob Maerten | 2014-03-07 | 1 | -4/+5 |
| | | | | | | | | |||||
* | | | | | | | | [fix] test if user_id doesn't exist in feeds generation | Nicolas Lœuillet | 2014-03-10 | 1 | -0/+4 |
| | | | | | | | | |||||
* | | | | | | | | bagit link + overlay save link + listmode | Thomas LEBEAU | 2014-03-08 | 5 | -24/+107 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-03-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #533 from mariroz/dev | Nicolas Lœuillet | 2014-03-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix of #530 - import fail from Poche | ||||
| | * | | | | | | | fix of #530 - import fail from Poche | Maryana Rozhankivska | 2014-03-07 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* / / / / / / / | [add] clean content articles in cron | Nicolas Lœuillet | 2014-03-07 | 1 | -5/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #532 from wallabag/upload-file | Nicolas Lœuillet | 2014-03-07 | 6 | -103/+225 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | New import system | ||||
| * \ \ \ \ \ \ | Merge pull request #531 from mariroz/upload-file | Nicolas Lœuillet | 2014-03-07 | 1 | -10/+16 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | getPageContent moved to Tools, fix of #426 | ||||
| | * | | | | | | | getPageContent moved to Tools, fix of #426 | Maryana Rozhankivska | 2014-03-07 | 1 | -10/+16 |
| |/ / / / / / / | |||||
| * | | | | | | | [add] cron to fetch content on imported entries | Nicolas Lœuillet | 2014-02-28 | 5 | -89/+181 |
| | | | | | | | | |||||
| * | | | | | | | [add] upload form for import | Nicolas Lœuillet | 2014-02-28 | 4 | -14/+38 |
| | | | | | | | | |||||
* | | | | | | | | [fix] remember scroll position for baggy theme #519 | Nicolas Lœuillet | 2014-03-06 | 1 | -0/+19 |
| | | | | | | | | |||||
* | | | | | | | | [fix] links for firefox / android / ios apps | Nicolas Lœuillet | 2014-03-06 | 2 | -5/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #524 from kevmeyer/dev | Nicolas Lœuillet | 2014-03-04 | 2 | -284/+284 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | updated german localization | ||||
| * | | | | | | | | added missing german localization strings | Kevin Meyer | 2014-03-04 | 2 | -68/+68 |
| | | | | | | | | | |||||
| * | | | | | | | | updated german localization | Kevin Meyer | 2014-03-04 | 2 | -292/+292 |
|/ / / / / / / / | |||||
* | | | | | | | | [change] ignore tmp files in HTML purifier | Nicolas Lœuillet | 2014-03-02 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | [fix] #115 cookie lifetime was empty | Nicolas Lœuillet | 2014-03-02 | 2 | -4/+10 |
| | | | | | | | | |||||
* | | | | | | | | [add] display last check of wallabag release | Nicolas Lœuillet | 2014-03-01 | 2 | -5/+14 |
| | | | | | | | |