aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'anno1337-dev' into devNicolas Lœuillet2014-07-223-15/+17
|\
| * Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-devNicolas Lœuillet2014-07-223-15/+17
|/|
| * Split up check_setup.php into two files. The new file check_essentials.php ↵Marc Wilhelm2014-07-223-15/+17
| | | | | | | | takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773
* | Merge branch 'feature/programmingCodeSyntaxHighlighting' into devNicolas Lœuillet2014-07-229-0/+448
|\ \ | |/ |/|
| * Merge branch 'dev' into feature/programmingCodeSyntaxHighlightingNicolas Lœuillet2014-07-222-302/+311
| |\ | |/ |/|
* | Merge pull request #775 from wallabag/feature/someMoreSitesConfigNicolas Lœuillet2014-07-211-0/+9
|\ \ | | | | | | issue #750 - config for dn.pt site added
* \ \ Merge branch 'skibbipl-dev' into devNicolas Lœuillet2014-07-212-302/+311
|\ \ \
| * | | Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-devNicolas Lœuillet2014-07-212-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 translationskibbipl2014-07-212-227/+352
| | | |
| | | * highlight.js library added to highlight programming code examples in article ↵Maryana Rozhankivska2014-07-229-0/+448
| | |/ | | | | | | | | | view
| | * issue #750 - config for dn.pt site addedMaryana Rozhankivska2014-07-211-0/+9
| |/ |/|
* | Merge pull request #752 from mariroz/devNicolas Lœuillet2014-07-121-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 Rozhankivska2014-07-091-2/+2
| | | | | | | | | | | | longer exists.
| * | fix of issue #619 and other similar, error in JSLikeHTMLElement: node no ↵Maryana Rozhankivska2014-07-091-2/+15
| | | | | | | | | | | | longer exists.
* | | Merge pull request #754 from sinisterstuf/about.comNicolas Lœuillet2014-07-121-0/+14
|\ \ \ | | | | | | | | Add support for *.about.com
| * | | Add support for *.about.comSiôn Le Roux2014-07-111-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œuillet2014-07-106-27/+30
| | |
* | | new call for having domain name in entry viewNicolas Lœuillet2014-07-081-2/+2
| | |
* | | new fields in database, reading time / date and domain name are storedNicolas Lœuillet2014-07-085-28/+26
|/ /
* | Merge pull request #751 from mariroz/devNicolas Lœuillet2014-07-071-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 articlesMaryana Rozhankivska2014-07-071-0/+4
| | |
* | | 1.7.1Nicolas Lœuillet2014-07-051-1/+1
| | |
* | | new config file, fix for #740tcitworld2014-07-011-0/+9
| | |
* | | fix for #738tcitworld2014-06-301-1/+1
| | |
* | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:40:18 +0000