aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* security checktcitworld2014-06-301-3/+3
|
* Merge pull request #737 from mariroz/devtcitworld2014-06-252-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 Rozhankivska2014-06-252-1/+15
| | | | | | | | "base" tag, tnx to @fivefilters
* | Merge pull request #736 from mariroz/devtcitworld2014-06-251-40/+65
|\| | | | | fix of issue #718: Error parsing file imported from Pocket #718
| * fix of issue #718: Error parsing file imported from Pocket #718Maryana Rozhankivska2014-06-251-40/+65
|/
* Merge pull request #728 from Draky50110/devtcitworld2014-06-122-88/+20
|\ | | | | typo FR après vérif.
| * typo mineuredraky501102014-06-122-2/+2
| |
| * fin de correction typo FRdraky501102014-06-122-1/+1
| |
| * Revert "Typo FR (suite)"draky501102014-06-121-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 3draky501102014-06-122-73/+5
| |
| * Typo FR (suite)draky501102014-06-122-17/+17
|/
* Merge pull request #724 from Draky50110/devtcitworld2014-06-122-4/+4
|\ | | | | typo FR
| * typo FRdraky501102014-06-122-4/+4
|/
* Merge pull request #722 from tcitworld/devtcitworld2014-06-072-4/+10
|\ | | | | do not output debug while generating epub
| * up to datetcit2014-06-0730-4235/+4960
| |\ | |/ |/|
* | Merge pull request #716 from mariroz/devtcitworld2014-06-054-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 Rozhankivska2014-06-024-4/+11
|/ / | | | | | | in config
* | Merge pull request #715 from mariroz/devtcitworld2014-06-011-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 Rozhankivska2014-06-011-0/+1
| | | | | | | | | | | | issue #14
* | | Merge pull request #713 from mariroz/devNicolas Lœuillet2014-05-301-21/+20
|\| | | | | | | | small xss vulnerability and translation ability fix
| * | small xss vulnerability and translation ability fixMaryana Rozhankivska2014-05-301-1/+1
| | |
| * | small xss vulnerability and translation ability fixMaryana Rozhankivska2014-05-301-21/+20
|/ /
* | 1.7, premium version :)Nicolas Lœuillet2014-05-291-1/+1
| |
* | fix #344 FQDN with non-standard ports brokenNicolas Lœuillet2014-05-291-0/+4
| |
* | Merge pull request #711 from mariroz/devNicolas Lœuillet2014-05-291-3/+6
|\ \ | | | | | | fix of uninitialized object warning, issue #710
| * | fix of uninitialized object warning, issue #710Maryana Rozhankivska2014-05-291-3/+6
| | |
* | | Merge pull request #707 from mariroz/devNicolas Lœuillet2014-05-2924-4206/+4868
|\| | | | | | | | update to 3.2 version of full-text-rss, issue #694
| * | add dailymotion videos, issue #708Maryana Rozhankivska2014-05-262-5/+18
| | |
| * | fix of onmouseover displaying of wallbabag a link in wallabag form in ↵Maryana Rozhankivska2014-05-241-2/+19
| | | | | | | | | | | | default theme
| * | fix of rearch form popup in default themeMaryana Rozhankivska2014-05-241-14/+0
| | |
| * | full-text rss config file for ted.com, issue #676Maryana Rozhankivska2014-05-231-0/+11
| | |
| * | last 3 important changes to 3.2 version of full-text-rss, issue #694Maryana Rozhankivska2014-05-233-0/+743
| | |
| * | two small unimportant forgotten changes to 3.2 version of full-text-rss, ↵Maryana Rozhankivska2014-05-232-354/+3
| | | | | | | | | | | | issue #694
| * | update to 3.2 version of full-text-rss, issue #694Maryana Rozhankivska2014-05-2215-4172/+4415
|/ /
* | Merge pull request #706 from gboudreau/devtcitworld2014-05-211-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 Boudreau2014-05-211-2/+3
| | |
* | | Merge pull request #703 from tcitworld/images_securitytcitworld2014-05-202-6/+55
|\ \ \ | | | | | | | | Security fixes for downloaded images (thanks @leblanc-simon)
| * | | Added info for DOWNLOAD_PICTUREStcitworld2014-05-201-1/+1
| | | | | | | | | | | | We regenerate pictures, it might take some time
| * | | Merge pull request #1 from leblanc-simon/images_securitytcitworld2014-05-201-28/+45
| |\ \ \ | | | | | | | | | | Optimisation et gestion des erreurs
| | * | | Optimisation et gestion des erreursSimon Leblanc2014-05-201-28/+45
| |/ / /
| * | | Fixed bug for png imagestcit2014-05-191-1/+1
| | | |
| * | | Bug with brackettcit2014-05-191-1/+1
| | | |
| * | | Option for setting qualitytcit2014-05-192-2/+3
| | | |
| * | | Merge branch 'dev' into images_securitytcit2014-05-191-0/+1
| |\ \ \
| * | | | Security fix for Download Imagestcit2014-05-181-3/+33
| | | | |
* | | | | Merge pull request #697 from tcitworld/devtcitworld2014-05-1822-47/+6377
|\| | | | | |_|/ / |/| | | Up-to-date with me
* | | | Better Grammartcitworld2014-05-171-1/+1
| | | |
* | | | Merge pull request #693 from tcitworld/devtcitworld2014-05-162-2/+21
|\ \ \ \ | | | | | | | | | | better wallabag in wallabag button (see #685)
* \ \ \ \ Merge pull request #689 from tcitworld/devNicolas Lœuillet2014-05-163-33/+71
|\ \ \ \ \ | | | | | | | | | | | | Tag-related features
| | | | | * do not debug inside an epubtcit2014-06-072-6/+12
| | | | |/