aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* import w/o cronMaryana Rozhankivska2014-04-032-323/+46
* import without cronMaryana Rozhankivska2014-04-0210-48/+61
|\
| * Important fixes for search engine (thx @mariroz)tcit2014-04-027-20/+45
* | import without cronMaryana Rozhankivska2014-04-029-262/+352
|/
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devNicolas Lœuillet2014-03-306-14/+7
|\
| * Merge pull request #588 from mariroz/devNicolas Lœuillet2014-03-306-14/+7
| |\
| | * fix of bug with default theme constantMaryana Rozhankivska2014-03-286-14/+7
* | | oops, restore @tcitworld commit. I'm so tiredNicolas Lœuillet2014-03-301-10/+58
|/ /
* | [fix] undefined vars in install scriptNicolas Lœuillet2014-03-301-56/+8
* | Improvements to install scripttcit2014-03-282-10/+46
|/
* Final Fix of #570tcit2014-03-281-1/+3
* Merge pull request #587 from mariroz/devNicolas Lœuillet2014-03-2816-56/+56
|\
| * problem with resources and localhost url fixMaryana Rozhankivska2014-03-2816-56/+56
|/
* Fix to bug #570tcit2014-03-281-0/+1
* Merge pull request #586 from mariroz/wb-link-in-wbNicolas Lœuillet2014-03-278-103/+163
|\
| * wallabag a link in wallabag now in default theme, issue #505Maryana Rozhankivska2014-03-278-103/+163
* | Merge pull request #585 from kevmeyer/devNicolas Lœuillet2014-03-272-71/+166
|\ \ | |/ |/|
| * updated german localisationKevin Meyer2014-03-272-71/+166
|/
* Improvements for compatibility_test filetcit2014-03-261-56/+82
* Fix of #580 : Add some random for Windows hoststcit2014-03-261-1/+7
* Finished search engine functiontcit2014-03-261-2/+2
* Merge pull request #582 from mariroz/fix-session-livetimeNicolas Lœuillet2014-03-241-2/+2
|\
| * fix of localhost cookie related to nginx binding to 0.0.0.0Maryana Rozhankivska2014-03-211-2/+2
* | Fixes to search enginetcit2014-03-237-23/+100
* | Implemented rudimental search enginetcit2014-03-225-4/+42
|/
* 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
|\ \ \ \ \ \ \