Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev | Nicolas Lœuillet | 2014-07-22 | 9 | -0/+448 |
|\ | |||||
| * | Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting | Nicolas Lœuillet | 2014-07-22 | 2 | -302/+311 |
| |\ | |/ |/| | |||||
* | | Merge pull request #775 from wallabag/feature/someMoreSitesConfig | Nicolas Lœuillet | 2014-07-21 | 1 | -0/+9 |
|\ \ | | | | | | | issue #750 - config for dn.pt site added | ||||
* \ \ | Merge branch 'skibbipl-dev' into dev | Nicolas Lœuillet | 2014-07-21 | 2 | -302/+311 |
|\ \ \ | |||||
| * | | | Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev | Nicolas Lœuillet | 2014-07-21 | 2 | -302/+311 |
|/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | ||||
| * | | | Updated polish translation | skibbipl | 2014-07-21 | 2 | -227/+352 |
| | | | | |||||
| | | * | highlight.js library added to highlight programming code examples in article ↵ | Maryana Rozhankivska | 2014-07-22 | 9 | -0/+448 |
| | |/ | | | | | | | | | | view | ||||
| | * | issue #750 - config for dn.pt site added | Maryana Rozhankivska | 2014-07-21 | 1 | -0/+9 |
| |/ |/| | |||||
* | | Merge pull request #752 from mariroz/dev | Nicolas Lœuillet | 2014-07-12 | 1 | -2/+15 |
|\ \ | | | | | | | fix of issue #650, #619 and other similar, error in JSLikeHTMLElement: node no longer exists. | ||||
| * | | fix of issue #619 and other similar, error in JSLikeHTMLElement: node no ↵ | Maryana Rozhankivska | 2014-07-09 | 1 | -2/+2 |
| | | | | | | | | | | | | longer exists. | ||||
| * | | fix of issue #619 and other similar, error in JSLikeHTMLElement: node no ↵ | Maryana Rozhankivska | 2014-07-09 | 1 | -2/+15 |
| | | | | | | | | | | | | longer exists. | ||||
* | | | Merge pull request #754 from sinisterstuf/about.com | Nicolas Lœuillet | 2014-07-12 | 1 | -0/+14 |
|\ \ \ | | | | | | | | | Add support for *.about.com | ||||
| * | | | Add support for *.about.com | Siôn Le Roux | 2014-07-11 | 1 | -0/+14 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes next_page_link for multi-page articles and strips pesky in-line 'next' links from the article body. Also includes an Xpath for author but I can't see where this is used in the wallabag UI. The 'tidy' option is turned off because it messed up bulleted lists. Tested with psychology.about.com and food.about.com. | ||||
* | | | I removed my previous commit. We have to create a new branch for that. | Nicolas Lœuillet | 2014-07-10 | 6 | -27/+30 |
| | | | |||||
* | | | new call for having domain name in entry view | Nicolas Lœuillet | 2014-07-08 | 1 | -2/+2 |
| | | | |||||
* | | | new fields in database, reading time / date and domain name are stored | Nicolas Lœuillet | 2014-07-08 | 5 | -28/+26 |
|/ / | |||||
* | | Merge pull request #751 from mariroz/dev | Nicolas Lœuillet | 2014-07-07 | 1 | -0/+4 |
|\ \ | | | | | | | quick fix of issue #750: mulipage content for politico.com/magazine articles | ||||
| * | | quick fix of issue #750: mulipage content for politico.com/magazine articles | Maryana Rozhankivska | 2014-07-07 | 1 | -0/+4 |
| | | | |||||
* | | | 1.7.1 | Nicolas Lœuillet | 2014-07-05 | 1 | -1/+1 |
| | | | |||||
* | | | new config file, fix for #740 | tcitworld | 2014-07-01 | 1 | -0/+9 |
| | | | |||||
* | | | fix for #738 | tcitworld | 2014-06-30 | 1 | -1/+1 |
| | | | |||||
* | | | security check | tcitworld | 2014-06-30 | 1 | -3/+3 |
| | | | |||||
* | | | Merge pull request #737 from mariroz/dev | tcitworld | 2014-06-25 | 2 | -1/+15 |
|\| | | | | | | | | fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters | ||||
| * | | fix of issue #677: When downloading images, wallabag doesnt respect html ↵ | Maryana Rozhankivska | 2014-06-25 | 2 | -1/+15 |
| | | | | | | | | | | | | "base" tag, tnx to @fivefilters | ||||
* | | | Merge pull request #736 from mariroz/dev | tcitworld | 2014-06-25 | 1 | -40/+65 |
|\| | | | | | | | | fix of issue #718: Error parsing file imported from Pocket #718 | ||||
| * | | fix of issue #718: Error parsing file imported from Pocket #718 | Maryana Rozhankivska | 2014-06-25 | 1 | -40/+65 |
|/ / | |||||
* | | Merge pull request #728 from Draky50110/dev | tcitworld | 2014-06-12 | 2 | -88/+20 |
|\ \ | | | | | | | typo FR après vérif. | ||||
| * | | typo mineure | draky50110 | 2014-06-12 | 2 | -2/+2 |
| | | | |||||
| * | | fin de correction typo FR | draky50110 | 2014-06-12 | 2 | -1/+1 |
| | | | |||||
| * | | Revert "Typo FR (suite)" | draky50110 | 2014-06-12 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7f186e21e0a121320485dca9c846b4c3df261deb. Conflicts: locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | ||||
| * | | typo FR 3 | draky50110 | 2014-06-12 | 2 | -73/+5 |
| | | | |||||
| * | | Typo FR (suite) | draky50110 | 2014-06-12 | 2 | -17/+17 |
|/ / | |||||
* | | Merge pull request #724 from Draky50110/dev | tcitworld | 2014-06-12 | 2 | -4/+4 |
|\ \ | | | | | | | typo FR | ||||
| * | | typo FR | draky50110 | 2014-06-12 | 2 | -4/+4 |
|/ / | |||||
* | | Merge pull request #722 from tcitworld/dev | tcitworld | 2014-06-07 | 2 | -4/+10 |
|\ \ | | | | | | | do not output debug while generating epub | ||||
| * \ | up to date | tcit | 2014-06-07 | 30 | -4235/+4960 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #716 from mariroz/dev | tcitworld | 2014-06-05 | 4 | -4/+11 |
|\ \ \ | | | | | | | | | error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config | ||||
| * | | | error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden ↵ | Maryana Rozhankivska | 2014-06-02 | 4 | -4/+11 |
|/ / / | | | | | | | | | | in config | ||||
* | | | Merge pull request #715 from mariroz/dev | tcitworld | 2014-06-01 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14 | ||||
| * | | | fix of undefined ATOM constant warning in full-text-rss, will fix ios-app ↵ | Maryana Rozhankivska | 2014-06-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | issue #14 | ||||
* | | | | Merge pull request #713 from mariroz/dev | Nicolas Lœuillet | 2014-05-30 | 1 | -21/+20 |
|\| | | | | | | | | | | | small xss vulnerability and translation ability fix | ||||
| * | | | small xss vulnerability and translation ability fix | Maryana Rozhankivska | 2014-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | small xss vulnerability and translation ability fix | Maryana Rozhankivska | 2014-05-30 | 1 | -21/+20 |
|/ / / | |||||
* | | | 1.7, premium version :) | Nicolas Lœuillet | 2014-05-29 | 1 | -1/+1 |
| | | | |||||
* | | | fix #344 FQDN with non-standard ports broken | Nicolas Lœuillet | 2014-05-29 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #711 from mariroz/dev | Nicolas Lœuillet | 2014-05-29 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | fix of uninitialized object warning, issue #710 | ||||
| * | | | fix of uninitialized object warning, issue #710 | Maryana Rozhankivska | 2014-05-29 | 1 | -3/+6 |
| | | | | |||||
* | | | | Merge pull request #707 from mariroz/dev | Nicolas Lœuillet | 2014-05-29 | 24 | -4206/+4868 |
|\| | | | | | | | | | | | update to 3.2 version of full-text-rss, issue #694 | ||||
| * | | | add dailymotion videos, issue #708 | Maryana Rozhankivska | 2014-05-26 | 2 | -5/+18 |
| | | | | |||||
| * | | | fix of onmouseover displaying of wallbabag a link in wallabag form in ↵ | Maryana Rozhankivska | 2014-05-24 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | | default theme |