aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #816 from zinnober/devNicolas Lœuillet2014-09-032-26/+136
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Complete rework of faz.net-template
| * | | | | Complete rework of faz.net-template adding multipage support and major ↵zinnober2014-08-232-26/+136
|/ / / / / | | | | | | | | | | | | | | | article cleanup
* | | | | 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 into db class
| | * | | | | vendor dir is not accessible before install, sqlite db dir write check moved ↵Maryana Rozhankivska2014-08-213-6/+5
| | | |_|/ / | | |/| | | | | | | | | | | | | | | into db class
* | | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | #763 fix to display the login successful message with the translation
| | * | | | | 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' item
| | * | | | | | 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 display
| | * | | | | 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 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 pull request #771 from tcitworld/refactorNicolas Lœuillet2014-09-162-6/+4
| | |_|/| | | | |/| | |/ / | | | | | | fixed bug for epub export #755 ; also better metadata title
| | | | * | fixed bug for epub export #755 ; also better metadata titletcit2014-07-202-6/+4
| | | | | |
| * | | | | 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
| | | | |
| | | | * added moreQueries for postgressqlMaryana Rozhankivska2014-08-211-0/+7
| | | | |
| | | | * Add data for mysql installation, see #624Nicolas Lœuillet2014-07-221-0/+12
| |_|_|/ |/| | |
* | | | 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
| |\ \ \ | |/ / / |/| | |