Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | import w/o cron | Maryana Rozhankivska | 2014-04-03 | 2 | -323/+46 |
| | |||||
* | import without cron | Maryana Rozhankivska | 2014-04-02 | 10 | -48/+61 |
|\ | |||||
| * | Important fixes for search engine (thx @mariroz) | tcit | 2014-04-02 | 7 | -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 | ||||
* | | import without cron | Maryana Rozhankivska | 2014-04-02 | 9 | -262/+352 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-03-30 | 6 | -14/+7 |
|\ | |||||
| * | Merge pull request #588 from mariroz/dev | Nicolas Lœuillet | 2014-03-30 | 6 | -14/+7 |
| |\ | | | | | | | fix of bug with default theme constant | ||||
| | * | fix of bug with default theme constant | Maryana Rozhankivska | 2014-03-28 | 6 | -14/+7 |
| | | | |||||
* | | | oops, restore @tcitworld commit. I'm so tired | Nicolas Lœuillet | 2014-03-30 | 1 | -10/+58 |
|/ / | |||||
* | | [fix] undefined vars in install script | Nicolas Lœuillet | 2014-03-30 | 1 | -56/+8 |
| | | |||||
* | | Improvements to install script | tcit | 2014-03-28 | 2 | -10/+46 |
|/ | | | | | | * automatically remove install/ folder * go easier though the compatibility test <-> install script pages * Small fixes which raised php warnings | ||||
* | Final Fix of #570 | tcit | 2014-03-28 | 1 | -1/+3 |
| | | | | Adds a date information to the exported data file. | ||||
* | Merge pull request #587 from mariroz/dev | Nicolas Lœuillet | 2014-03-28 | 16 | -56/+56 |
|\ | | | | | problem with resources and localhost url fix | ||||
| * | problem with resources and localhost url fix | Maryana Rozhankivska | 2014-03-28 | 16 | -56/+56 |
|/ | |||||
* | Fix to bug #570 | tcit | 2014-03-28 | 1 | -0/+1 |
| | | | | Forces the download of the data exported file as a poche-export file. | ||||
* | Merge pull request #586 from mariroz/wb-link-in-wb | Nicolas Lœuillet | 2014-03-27 | 8 | -103/+163 |
|\ | | | | | wallabag a link in wallabag now in default theme, issue #505 | ||||
| * | wallabag a link in wallabag now in default theme, issue #505 | Maryana Rozhankivska | 2014-03-27 | 8 | -103/+163 |
| | | |||||
* | | Merge pull request #585 from kevmeyer/dev | Nicolas Lœuillet | 2014-03-27 | 2 | -71/+166 |
|\ \ | |/ |/| | updated german localisation | ||||
| * | updated german localisation | Kevin Meyer | 2014-03-27 | 2 | -71/+166 |
|/ | |||||
* | Improvements for compatibility_test file | tcit | 2014-03-26 | 1 | -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 hosts | tcit | 2014-03-26 | 1 | -1/+7 |
| | |||||
* | Finished search engine function | tcit | 2014-03-26 | 1 | -2/+2 |
| | | | | Now searches also in title and in original url | ||||
* | Merge pull request #582 from mariroz/fix-session-livetime | Nicolas Lœuillet | 2014-03-24 | 1 | -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.0 | Maryana Rozhankivska | 2014-03-21 | 1 | -2/+2 |
| | | |||||
* | | Fixes to search engine | tcit | 2014-03-23 | 7 | -23/+100 |
| | | | | | | | | | | Changed the search parameter from POST to GET. Also, adapted the Baggy theme. | ||||
* | | Implemented rudimental search engine | tcit | 2014-03-22 | 5 | -4/+42 |
|/ | |||||
* | 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 |