aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | 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
|/ / /
* | | 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 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 "bas...Maryana Rozhankivska2014-06-252-1/+15
* | | Merge pull request #736 from mariroz/devtcitworld2014-06-251-40/+65
|\| |
| * | fix of issue #718: Error parsing file imported from Pocket #718Maryana Rozhankivska2014-06-251-40/+65
|/ /
* | Merge pull request #728 from Draky50110/devtcitworld2014-06-122-88/+20
|\ \
| * | typo mineuredraky501102014-06-122-2/+2
| * | fin de correction typo FRdraky501102014-06-122-1/+1
| * | Revert "Typo FR (suite)"draky501102014-06-121-0/+0
| * | typo FR 3draky501102014-06-122-73/+5
| * | Typo FR (suite)draky501102014-06-122-17/+17
|/ /
* | Merge pull request #724 from Draky50110/devtcitworld2014-06-122-4/+4
|\ \
| * | typo FRdraky501102014-06-122-4/+4
|/ /
* | Merge pull request #722 from tcitworld/devtcitworld2014-06-072-4/+10
|\ \
| * \ up to datetcit2014-06-0730-4235/+4960
| |\ \ | |/ / |/| |
* | | Merge pull request #716 from mariroz/devtcitworld2014-06-054-4/+11
|\ \ \
| * | | error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden i...Maryana Rozhankivska2014-06-024-4/+11
|/ / /
* | | Merge pull request #715 from mariroz/devtcitworld2014-06-011-0/+1
|\ \ \
| * | | fix of undefined ATOM constant warning in full-text-rss, will fix ios-app iss...Maryana Rozhankivska2014-06-011-0/+1
* | | | Merge pull request #713 from mariroz/devNicolas Lœuillet2014-05-301-21/+20
|\| | |
| * | | small xss vulnerability and translation ability fixMaryana Rozhankivska2014-05-301-1/+1
| * | | small xss vulnerability and translation ability fixMaryana Rozhankivska2014-05-301-21/+20
|/ / /
* | | 1.7, premium version :)Nicolas Lœuillet2014-05-291-1/+1
* | | fix #344 FQDN with non-standard ports brokenNicolas Lœuillet2014-05-291-0/+4
* | | Merge pull request #711 from mariroz/devNicolas Lœuillet2014-05-291-3/+6
|\ \ \
| * | | fix of uninitialized object warning, issue #710Maryana Rozhankivska2014-05-291-3/+6
* | | | Merge pull request #707 from mariroz/devNicolas Lœuillet2014-05-2924-4206/+4868
|\| | |