Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #622 from wallabag/fix-612 | Nicolas Lœuillet | 2014-04-08 | 1 | -1/+1 |
|\ | | | | | [fix] Escap key displays save a link form #612 | ||||
| * | [fix] Escap key displays save a link form #612 | Nicolas Lœuillet | 2014-04-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #621 from wallabag/fix-613 | Nicolas Lœuillet | 2014-04-08 | 4 | -18/+26 |
|\ | | | | | can't close search popup with the cross picture #613 | ||||
| * | can't close search popup with the cross picture #613 | Nicolas Lœuillet | 2014-04-08 | 4 | -18/+26 |
| | | |||||
* | | Merge pull request #618 from mariroz/dev | Nicolas Lœuillet | 2014-04-08 | 1 | -57/+56 |
|\ \ | | | | | | | remove duplicates by import; code formatting changes: tabs replaced with spaces | ||||
| * \ | code formatting changes: tabs replaced with spaces, some other small ↵ | Maryana Rozhankivska | 2014-04-08 | 6 | -684/+723 |
| |\ \ | |/ / |/| | | | | | formatting enhancements | ||||
* | | | Merge pull request #614 from wallabag/fix-host-getpocheurl | Nicolas Lœuillet | 2014-04-07 | 1 | -1/+3 |
|\ \ \ | |_|/ |/| | | [fix] with some config, http host is different | ||||
| * | | [fix] with some config, http host is different | Nicolas Lœuillet | 2014-04-07 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #611 from wallabag/fix-french-locale | Nicolas Lœuillet | 2014-04-07 | 2 | -44/+72 |
|\ \ | | | | | | | update french locale, thx to @goofy-bz and @Draky50110 #596 | ||||
| * | | update french locale, thx to @goofy-bz and @Draky50110 #596 | Nicolas Lœuillet | 2014-04-07 | 2 | -44/+72 |
| | | | |||||
* | | | Merge pull request #609 from wallabag/fix-desciption-typo | Nicolas Lœuillet | 2014-04-06 | 2 | -422/+420 |
|\ \ \ | |/ / |/| | | remove unnecessary variable declaration | ||||
| * | | remove unnecessary variable declaration | Nicolas Lœuillet | 2014-04-06 | 2 | -422/+420 |
|/ / | |||||
* | | Merge pull request #606 from wallabag/fix-556 | Nicolas Lœuillet | 2014-04-06 | 2 | -203/+216 |
|\ \ | | | | | | | in RSS feed, add link to wallabag URL #556 | ||||
| * | | in RSS feed, add link to wallabag URL #556 | Nicolas Lœuillet | 2014-04-06 | 2 | -203/+216 |
|/ / | |||||
* | | Merge pull request #605 from wallabag/fix-604 | Nicolas Lœuillet | 2014-04-06 | 1 | -1/+1 |
|\ \ | | | | | | | [fix] Use of undefined constant ATOM #604 | ||||
| * | | [fix] Use of undefined constant ATOM #604 | Nicolas Lœuillet | 2014-04-06 | 1 | -1/+1 |
|/ / | |||||
| * | remove duplicates by import, code changes: tabs replaced with spaces | Maryana Rozhankivska | 2014-04-08 | 1 | -36/+37 |
|/ | |||||
* | Merge pull request #603 from mariroz/dev | Nicolas Lœuillet | 2014-04-05 | 1 | -1/+1 |
|\ | | | | | postgres sequence error fix, issue #602 | ||||
| * | postgres sequence error fix, issue #602 | Maryana Rozhankivska | 2014-04-05 | 1 | -1/+1 |
| | | |||||
* | | Fix to #600 | tcitworld | 2014-04-04 | 1 | -4/+6 |
| | | |||||
* | | Changed copyright to 2014 | tcitworld | 2014-04-04 | 1 | -1/+1 |
| | | | | | | Happy new year ! | ||||
* | | [add] link on config page to fetch content | Nicolas Lœuillet | 2014-04-03 | 2 | -0/+2 |
| | | |||||
* | | yeah, 1.6, one year after the 1st commit | Nicolas Lœuillet | 2014-04-03 | 1 | -1/+1 |
|/ | |||||
* | import w/o cron: fix of "click to finish import" in baggy theme | Maryana Rozhankivska | 2014-04-03 | 1 | -1/+3 |
| | |||||
* | import w/o cron: explanation added | Maryana Rozhankivska | 2014-04-03 | 2 | -2/+2 |
| | |||||
* | import w/o cron: error in url fix | Maryana Rozhankivska | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | 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. |