aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Fix downloading SQLite database from all usersThomas Citharel2014-08-264-14/+11
* Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-213-6/+5
|\
| * Merge pull request #814 from wallabag/fix-issue813tcitworld2014-08-213-6/+5
| |\
| | * vendor dir is not accessible before install, sqlite db dir write check moved ...Maryana Rozhankivska2014-08-213-6/+5
* | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2014-08-214-3/+11
|\| |
| * | Merge pull request #783 from wallabag/message-after-loginNicolas Lœuillet2014-08-181-0/+8
| |\ \
| | * | fix to display the login successful message with the translationNicolas Lœuillet2014-07-221-0/+8
| * | | Merge pull request #784 from wallabag/fix-successful-add-messageNicolas Lœuillet2014-08-182-2/+2
| |\ \ \
| | * | | fix display of 'Done' message when we add a link from 'save a link' itemNicolas Lœuillet2014-07-222-2/+2
| | |/ /
| * | | Merge pull request #785 from wallabag/change-default-paginationNicolas Lœuillet2014-08-181-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | change default pagination, set it to 12, to have a nice baggy displayNicolas Lœuillet2014-07-221-1/+1
| | |/
* | | merge fix 776Thomas Citharel2014-08-163-39/+38
|\ \ \ | |/ / |/| |
| * | minimum of control on server side addedMaryana Rozhankivska2014-08-151-1/+4
| * | Fix #776Nicolas Lœuillet2014-07-222-2/+2
| |/
* | link to guidelines in contributing fileNicolas Lœuillet2014-07-251-0/+2
* | thank you @mariroz & @tcitworld :)Nicolas Lœuillet2014-07-251-0/+2
* | guidelines for wallabagNicolas Lœuillet2014-07-251-0/+53
* | 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 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
| |\ \ \ | |/ / / |/| | |
* | | | 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 ta...Marc Wilhelm2014-07-223-15/+17
| | |_|/ | |/| |
* | | | 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
|\ \ \ \ | | |_|/ | |/| |
* | | | 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
|/| | | |
| * | | | Updated polish translationskibbipl2014-07-212-227/+352
| | | * | highlight.js library added to highlight programming code examples in article ...Maryana Rozhankivska2014-07-229-0/+448
| | |/ /
| | * / 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 #619 and other similar, error in JSLikeHTMLElement: node no long...Maryana Rozhankivska2014-07-091-2/+2
| * | | fix of issue #619 and other similar, error in JSLikeHTMLElement: node no long...Maryana Rozhankivska2014-07-091-2/+15
* | | | Merge pull request #754 from sinisterstuf/about.comNicolas Lœuillet2014-07-121-0/+14
|\ \ \ \
| * | | | Add support for *.about.comSiôn Le Roux2014-07-111-0/+14
|/ / / /
| | | * 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
| | | | |\
| | | | | * 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