Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into refactor | Nicolas Lœuillet | 2014-07-23 | 17 | -320/+819 |
|\ | | | | | | | | | | | Conflicts: check_setup.php index.php | ||||
| * | Merge branch 'anno1337-dev' into dev | Nicolas Lœuillet | 2014-07-22 | 3 | -15/+17 |
| |\ | |||||
| | * | Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev | Nicolas Lœuillet | 2014-07-22 | 3 | -15/+17 |
| |/| | |||||
| | * | Split up check_setup.php into two files. The new file check_essentials.php ↵ | Marc Wilhelm | 2014-07-22 | 3 | -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 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. | ||||
* | | | | removed permissions test on htmlpurifier | Nicolas Lœuillet | 2014-07-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'refactor' of github.com:wallabag/wallabag into refactor | Nicolas Lœuillet | 2014-07-18 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #764 from tcitworld/refactor | Nicolas Lœuillet | 2014-07-17 | 1 | -8/+8 |
| |\ \ \ \ | | | | | | | | | | | | | Refactor Flattr class. | ||||
| | * | | | | camelCase for FlattrItem class (following) | tcitworld | 2014-07-17 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | camelCase for FlattrItem class | tcitworld | 2014-07-17 | 1 | -8/+8 |
| |/ / / / | |||||
* / / / / | remove .idea in gitignore | Nicolas Lœuillet | 2014-07-18 | 1 | -2/+1 |
|/ / / / | |||||
* | | | | updated specific configuration for parsing | Nicolas Lœuillet | 2014-07-13 | 952 | -5684/+7587 |
| | | | | |||||
* | | | | #584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder | Nicolas Lœuillet | 2014-07-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | #683 Rename « home » into « unread » | Nicolas Lœuillet | 2014-07-12 | 3 | -3/+3 |
| | | | | |||||
* | | | | Refactor | Nicolas Lœuillet | 2014-07-12 | 14 | -341/+393 |
| | | | | |||||
* | | | | forgot run() call | Nicolas Lœuillet | 2014-07-12 | 1 | -0/+1 |
| | | | | |||||
* | | | | ignore my PHPStorm config | Nicolas Lœuillet | 2014-07-12 | 1 | -1/+2 |
| | | | | |||||
* | | | | remove PicoFarad | Nicolas Lœuillet | 2014-07-12 | 8 | -553/+9 |
| | | | | | | | | | | | | | | | | I’ll implement it an other day. | ||||
* | | | | PicoFarad framework for routing | Nicolas Lœuillet | 2014-07-11 | 9 | -63/+646 |
| | | | | |||||
* | | | | WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one) | Nicolas Lœuillet | 2014-07-11 | 20 | -766/+925 |
|/ / / | |||||
* | | | 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 |
| | | |