aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1267 from wallabag/dev1.9.1Nicolas Lœuillet2015-08-03350-7103/+15542
|\
| * Merge pull request #1266 from wallabag/fix-site-configJeremy Benoist2015-08-02113-119/+742
| |\
| | * update config from @fivefiltersNicolas Lœuillet2015-08-01112-121/+734
| | * fix #982: config for quechoisir.orgNicolas Lœuillet2015-08-011-0/+10
| | * fix #1090: add config for computerworld.comNicolas Lœuillet2015-08-011-5/+2
| | * fix #1264: config for tofugu.comNicolas Lœuillet2015-08-011-0/+3
| |/
| * Merge branch 'axelsimon-patch-1' into devNicolas Lœuillet2015-07-311-1/+1
| |\
| | * fix documentation urlNicolas Lœuillet2015-07-311-1/+1
| | * Merge branch 'patch-1' of https://github.com/axelsimon/wallabag into axelsimo...Nicolas Lœuillet2015-07-312-1/+8
| | |\
| | | * fix link to documentationAxel Simon2015-07-241-1/+1
| * | | Merge pull request #1257 from freddyb/dev-autocloseThomas Citharel2015-07-301-2/+11
| |\ \ \
| | * | | Merge branch 'autoclose-postmessage' into devFrederik B2015-07-301-2/+11
| |/| | |
| | * | | Send postMessage to opener before autocloseFrederik B2015-07-301-2/+11
| | | |/ | | |/|
| * | | Merge pull request #1252 from wallabag/securityfixThomas Citharel2015-07-302-13/+1
| |\ \ \
| | * | | fix security bug with PHP_AUTH_USERThomas Citharel2015-07-282-13/+1
| * | | | Merge pull request #1226 from wallabag/MoriTanosuke-devThomas Citharel2015-07-293-2/+21
| |\ \ \ \
| | * | | | delete the debug callThomas Citharel2015-06-291-1/+0
| | * | | | fix BASE_URLThomas Citharel2015-06-292-7/+14
| | * | | | Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanos...Thomas Citharel2015-06-292-2/+15
| | |\ \ \ \
| | | * | | | Use config option BASE_URL in getPocheUrl()Carsten Ringe2015-06-091-2/+8
| | | | |/ / | | | |/| |
| * | | | | remove call to google fonts because privacy !Thomas Citharel2015-07-271-1/+0
| | |_|/ / | |/| | |
| * | | | add mark as read and next to keyboard shortcutsThomas Citharel2015-07-271-0/+9
| * | | | fix #1237, display a message instead of button when connections are not throu...Thomas Citharel2015-07-277-78/+144
| | |_|/ | |/| |
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-191-0/+6
| |\ \ \
| | * | | fix #1238 (yes, again !)Thomas Citharel2015-07-191-0/+6
| * | | | fixed a postgresql-related bug, more database functions secured and add an ex...Thomas Citharel2015-07-182-8/+20
| * | | | fixed bug for #1242Thomas Citharel2015-07-171-3/+3
| |/ / /
| * | | secure database functionsThomas Citharel2015-07-172-72/+85
| * | | fix #1238Thomas Citharel2015-07-101-0/+7
| * | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-081-0/+6
| |\ \ \
| | * \ \ Merge pull request #1234 from jmlrt/devThomas Citharel2015-07-081-0/+6
| | |\ \ \
| | | * | | add site config for des-livres-pour-changer-de-vie.frjmlrt2015-07-081-0/+6
| * | | | | new config filesThomas Citharel2015-07-085-0/+33
| * | | | | another siteconfig fileThomas Citharel2015-07-082-2/+10
| * | | | | fix saving URL with enter keyThomas Citharel2015-07-071-1/+3
| |/ / / /
| * | | | Merge branch 'dev' of https://github.com/wallabag/wallabag into devThomas Citharel2015-07-072-0/+12
| |\ \ \ \
| | * | | | Merge pull request #1228 from jmlrt/devThomas Citharel2015-07-062-0/+12
| | |\| | |
| | | * | | add site_config for cloudacademy.com and cyrille-borne.comjmlrt2015-07-062-0/+12
| | |/ / /
| * / / / Revert "[1005] fixing redirection when deleting archived article"Thomas Citharel2015-07-071-1/+1
| |/ / /
| * | | added a lot of siteconfig filesThomas Citharel2015-07-0613-0/+84
| * | | fix #1224Thomas Citharel2015-07-061-2/+6
| * | | fix #1209Thomas Citharel2015-07-061-0/+9
| |/ /
| * | deleted the js console logs callsThomas Citharel2015-06-201-6/+0
| * | new config fileThomas Citharel2015-06-171-0/+5
| * | Merge branch 'dev' of http://github.com/wallabag/wallabag into devThomas Citharel2015-06-131-0/+1
| |\ \
| | * \ Merge pull request #1217 from wallabag/fix-#1215Nicolas Lœuillet2015-06-121-0/+1
| | |\ \
| | | * | Fix #1215Thomas Citharel2015-06-111-0/+1
| | |/ /
| * / / bring back long lasting session...maybeThomas Citharel2015-06-112-3/+3
| |/ /
| * | Merge pull request #1211 from goofy-bz/patch-41.9.1beta3Thomas Citharel2015-06-071-1/+1
| |\ \
| | * | Update fr_FR.utf8.pogoofy-bz2015-06-071-1/+1
| |/ /