Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2014-08-21 | 3 | -6/+5 |
|\ | |||||
| * | Merge pull request #814 from wallabag/fix-issue813 | tcitworld | 2014-08-21 | 3 | -6/+5 |
| |\ | | | | | | | vendor dir is not accessible before install, sqlite db dir write check moved into db class | ||||
| | * | vendor dir is not accessible before install, sqlite db dir write check moved ↵ | Maryana Rozhankivska | 2014-08-21 | 3 | -6/+5 |
| | | | | | | | | | | | | into db class | ||||
* | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Thomas Citharel | 2014-08-21 | 4 | -3/+11 |
|\| | | |||||
| * | | Merge pull request #783 from wallabag/message-after-login | Nicolas Lœuillet | 2014-08-18 | 1 | -0/+8 |
| |\ \ | | | | | | | | | #763 fix to display the login successful message with the translation | ||||
| | * | | fix to display the login successful message with the translation | Nicolas Lœuillet | 2014-07-22 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge pull request #784 from wallabag/fix-successful-add-message | Nicolas Lœuillet | 2014-08-18 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | fix display of 'Done' message when we add a link from 'save a link' item | ||||
| | * | | | fix display of 'Done' message when we add a link from 'save a link' item | Nicolas Lœuillet | 2014-07-22 | 2 | -2/+2 |
| | |/ / | |||||
| * | | | Merge pull request #785 from wallabag/change-default-pagination | Nicolas Lœuillet | 2014-08-18 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | change default pagination, set it to 12, to have a nice baggy display | ||||
| | * | | change default pagination, set it to 12, to have a nice baggy display | Nicolas Lœuillet | 2014-07-22 | 1 | -1/+1 |
| | |/ | |||||
* | | | merge fix 776 | Thomas Citharel | 2014-08-16 | 3 | -39/+38 |
|\ \ \ | |/ / |/| | | |||||
| * | | minimum of control on server side added | Maryana Rozhankivska | 2014-08-15 | 1 | -1/+4 |
| | | | |||||
| * | | Fix #776 | Nicolas Lœuillet | 2014-07-22 | 2 | -2/+2 |
| |/ | |||||
* | | link to guidelines in contributing file | Nicolas Lœuillet | 2014-07-25 | 1 | -0/+2 |
| | | |||||
* | | thank you @mariroz & @tcitworld :) | Nicolas Lœuillet | 2014-07-25 | 1 | -0/+2 |
| | | |||||
* | | guidelines for wallabag | Nicolas Lœuillet | 2014-07-25 | 1 | -0/+53 |
| | | |||||
* | | Merge branch 'fix/securityAllowedActions' into dev | Nicolas Lœuillet | 2014-07-25 | 981 | -6818/+9000 |
|\ \ | |||||
| * | | typo | Nicolas Lœuillet | 2014-07-25 | 1 | -4/+4 |
| | | | |||||
| * | | security issue | Maryana Rozhankivska | 2014-07-24 | 2 | -42/+45 |
| | | | |||||
| * | | Merge branch 'dev' of github.com:wallabag/wallabag into dev | Nicolas Lœuillet | 2014-07-23 | 1 | -0/+21 |
| |\ \ | |||||
| | * | | Merge pull request #789 from wallabag/feature/someMoreSitesConfig | Nicolas Lœuillet | 2014-07-23 | 1 | -0/+21 |
| |/| | |/| | | | | | | | config for habrahabr.ru to grab articles with comments | ||||
| | * | | config for habrahabr.ru to grep articles with comments | Maryana Rozhankivska | 2014-07-23 | 1 | -0/+21 |
| | | | | |||||
| * | | | Merge branch 'refactor' into dev | Nicolas Lœuillet | 2014-07-23 | 980 | -6816/+8974 |
|/| | | | |||||
| * | | | 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 |
| | | | |