aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Important fixes for search engine (thx @mariroz)tcit2014-04-027-20/+45
| | | | | | | | | | | | So sorry for the mess... :( * search only in users' own articles * sanitized what is searched * display what is searched * pagination, sorting available when searching * use existing function to query db * bad encoding caracters fixed * link to JQuery into default theme, no longer in each theme * some spaces instead of tabs
* 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 constant
| | * 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
|/ | | | | | * automatically remove install/ folder * go easier though the compatibility test <-> install script pages * Small fixes which raised php warnings
* Final Fix of #570tcit2014-03-281-1/+3
| | | | Adds a date information to the exported data file.
* Merge pull request #587 from mariroz/devNicolas Lœuillet2014-03-2816-56/+56
|\ | | | | problem with resources and localhost url fix
| * problem with resources and localhost url fixMaryana Rozhankivska2014-03-2816-56/+56
|/
* Fix to bug #570tcit2014-03-281-0/+1
| | | | Forces the download of the data exported file as a poche-export file.
* 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 #505
| * 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 localisation
| * updated german localisationKevin Meyer2014-03-272-71/+166
|/
* Improvements for compatibility_test filetcit2014-03-261-56/+82
| | | | | | | - gettext detection (not default on WAMP) ; part fix of #579 - added colors to make viewing what's wrong better and quicker (green/orange/red) - added a link to index.php if it's good
* Fix of #580 : Add some random for Windows hoststcit2014-03-261-1/+7
|
* Finished search engine functiontcit2014-03-261-2/+2
| | | | Now searches also in title and in original url
* 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.0
| * 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
| | | | | | | | | | Changed the search parameter from POST to GET. Also, adapted the Baggy theme.
* | 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-fpm
| * 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 variable
| * 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 added
| * 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 livetime
| * 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)"
| * 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
|\| | | | | Update brazilian translation
| * 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
| | |\ | | | | | | | | 1.5.2
| | * \ Merge pull request #469 from wallabag/devNicolas Lœuillet2014-02-192-4/+4
| | |\ \ | | | | | | | | | | version number 1.5.1
| | * \ \ Merge pull request #468 from wallabag/dev1.5.1Nicolas Lœuillet2014-02-199-16/+440
| | |\ \ \ | | | | | | | | | | | | 1.5.1
| | * \ \ \ Merge pull request #450 from wallabag/dev1.5.0Nicolas Lœuillet2014-02-1388-184/+3269
| | |\ \ \ \ | | | | | | | | | | | | | | 1.5.0
* | | | | | | [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 justified (issue #554)
| * | | | | | | 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: ↵Maryana Rozhankivska2014-03-125-29/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | redev it to ajax action). Some enhancements to "save a link" popup div
* | | | | | | Merge pull request #549 from ↵Nicolas Lœuillet2014-03-121-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 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 of articles, autocomplete added according to #477, #542
| * | | | | | | a lot of enhancements related to tags: tags list is now sorted, shows number ↵Maryana Rozhankivska2014-03-1027-26/+3226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of articles, autocomplete added according to #477, #542