Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | fix of rearch form popup in default theme | Maryana Rozhankivska | 2014-05-24 | 1 | -14/+0 |
| | | | |||||
| * | | full-text rss config file for ted.com, issue #676 | Maryana Rozhankivska | 2014-05-23 | 1 | -0/+11 |
| | | | |||||
| * | | last 3 important changes to 3.2 version of full-text-rss, issue #694 | Maryana Rozhankivska | 2014-05-23 | 3 | -0/+743 |
| | | | |||||
| * | | two small unimportant forgotten changes to 3.2 version of full-text-rss, ↵ | Maryana Rozhankivska | 2014-05-23 | 2 | -354/+3 |
| | | | | | | | | | | | | issue #694 | ||||
| * | | update to 3.2 version of full-text-rss, issue #694 | Maryana Rozhankivska | 2014-05-22 | 15 | -4172/+4415 |
|/ / | |||||
* | | Merge pull request #706 from gboudreau/dev | tcitworld | 2014-05-21 | 1 | -2/+3 |
|\ \ | | | | | | | Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout) | ||||
| * | | Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout) | Guillaume Boudreau | 2014-05-21 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #703 from tcitworld/images_security | tcitworld | 2014-05-20 | 2 | -6/+55 |
|\ \ \ | | | | | | | | | Security fixes for downloaded images (thanks @leblanc-simon) | ||||
| * | | | Added info for DOWNLOAD_PICTURES | tcitworld | 2014-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | We regenerate pictures, it might take some time | ||||
| * | | | Merge pull request #1 from leblanc-simon/images_security | tcitworld | 2014-05-20 | 1 | -28/+45 |
| |\ \ \ | | | | | | | | | | | Optimisation et gestion des erreurs | ||||
| | * | | | Optimisation et gestion des erreurs | Simon Leblanc | 2014-05-20 | 1 | -28/+45 |
| |/ / / | |||||
| * | | | Fixed bug for png images | tcit | 2014-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bug with bracket | tcit | 2014-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Option for setting quality | tcit | 2014-05-19 | 2 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'dev' into images_security | tcit | 2014-05-19 | 1 | -0/+1 |
| |\ \ \ | |||||
| * | | | | Security fix for Download Images | tcit | 2014-05-18 | 1 | -3/+33 |
| | | | | | |||||
* | | | | | Merge pull request #697 from tcitworld/dev | tcitworld | 2014-05-18 | 22 | -47/+6377 |
|\| | | | | |_|/ / |/| | | | Up-to-date with me | ||||
* | | | | Better Grammar | tcitworld | 2014-05-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #693 from tcitworld/dev | tcitworld | 2014-05-16 | 2 | -2/+21 |
|\ \ \ \ | | | | | | | | | | | better wallabag in wallabag button (see #685) | ||||
* \ \ \ \ | Merge pull request #689 from tcitworld/dev | Nicolas Lœuillet | 2014-05-16 | 3 | -33/+71 |
|\ \ \ \ \ | | | | | | | | | | | | | Tag-related features |