aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #581 from mariroz/fix-session-livetimeNicolas Lœuillet2014-03-212-6/+5
|\
| * fix of issue under nginx and php-fpmMaryana Rozhankivska2014-03-212-6/+5
* | Merge pull request #576 from mariroz/fix-session-livetimeNicolas Lœuillet2014-03-191-1/+2
|\|
| * fix of _SESSION - indefined variableMaryana Rozhankivska2014-03-191-1/+2
|/
* Merge pull request #572 from mariroz/fix-session-livetimeNicolas Lœuillet2014-03-181-0/+3
|\
| * fix of #115, server relater config value addedMaryana Rozhankivska2014-03-181-0/+3
* | Merge pull request #567 from mariroz/fix-session-livetimeNicolas Lœuillet2014-03-173-7/+27
|\|
| * fix of #115 - stay connected and session livetimeMaryana Rozhankivska2014-03-173-7/+27
|/
* Merge pull request #566 from camporez/devNicolas Lœuillet2014-03-171-1/+1
|\
| * Update brazilian traslation title to "Português (Brasil)"camporez2014-03-161-1/+1
* | Merge pull request #563 from camporez/devNicolas Lœuillet2014-03-162-7/+7
|\|
| * Correct README.mdcamporez2014-03-161-1/+0
| * Update brazilian translationcamporez2014-03-152-7/+7
| *-. Merge remote-tracking branches 'upstream/dev' and 'origin/master' into devcamporez2014-03-1546-478/+4089
| |\ \ | |/ / |/| |
| | * Merge pull request #481 from wallabag/dev1.5.2Nicolas Lœuillet2014-02-21401-183/+31997
| | |\
| | * \ Merge pull request #469 from wallabag/devNicolas Lœuillet2014-02-192-4/+4
| | |\ \
| | * \ \ Merge pull request #468 from wallabag/dev1.5.1Nicolas Lœuillet2014-02-199-16/+440
| | |\ \ \
| | * \ \ \ Merge pull request #450 from wallabag/dev1.5.0Nicolas Lœuillet2014-02-1388-184/+3269
| | |\ \ \ \
* | | | | | | [fix] in RSS, link to original articleNicolas Lœuillet2014-03-141-1/+1
* | | | | | | [add] remove import file in CACHE when import is overNicolas Lœuillet2014-03-141-0/+9
* | | | | | | [fix] new import section in old themes #559Nicolas Lœuillet2014-03-142-9/+31
* | | | | | | Merge pull request #557 from mariroz/feature-add-link-inside-article-issue-505Nicolas Lœuillet2014-03-133-6/+34
|\ \ \ \ \ \ \
| * | | | | | | saving link form now sends ajax request, article view is now justifiedMaryana Rozhankivska2014-03-133-6/+34
|/ / / / / / /
* | | | | | | feature #505 - it is now possible to add link from bagged article (TODO: rede...Maryana Rozhankivska2014-03-125-29/+109
* | | | | | | Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelink...Nicolas Lœuillet2014-03-121-9/+12
|\ \ \ \ \ \ \
| * | | | | | | fix of conflict of s shortcat and entering s in input fieldsMaryana Rozhankivska2014-03-121-9/+12
|/ / / / / / /
* | | | | | | Merge pull request #544 from mariroz/feature-tags-autocompleteNicolas Lœuillet2014-03-1027-26/+3226
|\ \ \ \ \ \ \
| * | | | | | | a lot of enhancements related to tags: tags list is now sorted, shows number ...Maryana Rozhankivska2014-03-1027-26/+3226
* | | | | | | | Merge pull request #535 from bobmaerten/clarify-import-processNicolas Lœuillet2014-03-101-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Changed text to clarify import process.Bob Maerten2014-03-071-4/+5
* | | | | | | | [fix] test if user_id doesn't exist in feeds generationNicolas Lœuillet2014-03-101-0/+4
* | | | | | | | bagit link + overlay save link + listmodeThomas LEBEAU2014-03-085-24/+107
|/ / / / / / /
* | | | | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-03-071-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #533 from mariroz/devNicolas Lœuillet2014-03-071-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | fix of #530 - import fail from PocheMaryana Rozhankivska2014-03-071-0/+1
| |/ / / / / / /
* / / / / / / / [add] clean content articles in cronNicolas Lœuillet2014-03-071-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #532 from wallabag/upload-fileNicolas Lœuillet2014-03-076-103/+225
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #531 from mariroz/upload-fileNicolas Lœuillet2014-03-071-10/+16
| |\ \ \ \ \ \ \
| | * | | | | | | getPageContent moved to Tools, fix of #426Maryana Rozhankivska2014-03-071-10/+16
| |/ / / / / / /
| * | | | | | | [add] cron to fetch content on imported entriesNicolas Lœuillet2014-02-285-89/+181
| * | | | | | | [add] upload form for importNicolas Lœuillet2014-02-284-14/+38
* | | | | | | | [fix] remember scroll position for baggy theme #519Nicolas Lœuillet2014-03-061-0/+19
* | | | | | | | [fix] links for firefox / android / ios appsNicolas Lœuillet2014-03-062-5/+7
* | | | | | | | Merge pull request #524 from kevmeyer/devNicolas Lœuillet2014-03-042-284/+284
|\ \ \ \ \ \ \ \
| * | | | | | | | added missing german localization stringsKevin Meyer2014-03-042-68/+68
| * | | | | | | | updated german localizationKevin Meyer2014-03-042-292/+292
|/ / / / / / / /
* | | | | | | | [change] ignore tmp files in HTML purifierNicolas Lœuillet2014-03-021-1/+2
* | | | | | | | [fix] #115 cookie lifetime was emptyNicolas Lœuillet2014-03-022-4/+10
* | | | | | | | [add] display last check of wallabag releaseNicolas Lœuillet2014-03-012-5/+14
* | | | | | | | [fix] RSS Feeds don't validate / W3C #384Nicolas Lœuillet2014-03-012-2/+4
|/ / / / / / /