aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/securityAllowedActions' into devNicolas Lœuillet2014-07-25981-6818/+9000
|\
| * typoNicolas Lœuillet2014-07-251-4/+4
| |
| * security issueMaryana Rozhankivska2014-07-242-42/+45
| |
| * Merge branch 'dev' of github.com:wallabag/wallabag into devNicolas Lœuillet2014-07-231-0/+21
| |\
| | * Merge pull request #789 from wallabag/feature/someMoreSitesConfigNicolas Lœuillet2014-07-231-0/+21
| |/| |/| | | | | config for habrahabr.ru to grab articles with comments
| | * config for habrahabr.ru to grep articles with commentsMaryana Rozhankivska2014-07-231-0/+21
| | |
| * | Merge branch 'refactor' into devNicolas Lœuillet2014-07-23980-6816/+8974
|/| |
| * | Merge branch 'dev' into refactorNicolas Lœuillet2014-07-2317-320/+819
| |\ \ | |/ / |/| | | | | | | | | | | Conflicts: check_setup.php index.php
* | | 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.
| | | * removed permissions test on htmlpurifierNicolas Lœuillet2014-07-231-1/+1
| | | |
| | | * Merge branch 'refactor' of github.com:wallabag/wallabag into refactorNicolas Lœuillet2014-07-181-8/+8
| | | |\
| | | | * Merge pull request #764 from tcitworld/refactorNicolas Lœuillet2014-07-171-8/+8
| | | | |\ | | | | | | | | | | | | Refactor Flattr class.
| | | | | * camelCase for FlattrItem class (following)tcitworld2014-07-171-1/+1
| | | | | |
| | | | | * camelCase for FlattrItem classtcitworld2014-07-171-8/+8
| | | | |/
| | | * / remove .idea in gitignoreNicolas Lœuillet2014-07-181-2/+1
| | | |/
| | | * updated specific configuration for parsingNicolas Lœuillet2014-07-13952-5684/+7587
| | | |
| | | * #584 check permissions for HTMLPurifier/DefinitionCache/Serializer folderNicolas Lœuillet2014-07-121-1/+1
| | | |
| | | * #683 Rename « home » into « unread »Nicolas Lœuillet2014-07-123-3/+3
| | | |
| | | * RefactorNicolas Lœuillet2014-07-1214-341/+393
| | | |
| | | * forgot run() callNicolas Lœuillet2014-07-121-0/+1
| | | |
| | | * ignore my PHPStorm configNicolas Lœuillet2014-07-121-1/+2
| | | |
| | | * remove PicoFaradNicolas Lœuillet2014-07-128-553/+9
| | | | | | | | | | | | | | | | I’ll implement it an other day.
| | | * PicoFarad framework for routingNicolas Lœuillet2014-07-119-63/+646
| | | |
| | | * WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)Nicolas Lœuillet2014-07-1120-766/+925
| |_|/ |/| |
* | | 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