aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #427 from wallabag/dev1.4.0Nicolas Lœuillet2014-02-0384-173/+1397
|\
| * [fix] #389 Empty article title (blank title tag)nicosomb2014-02-031-1/+1
| * [fix] Add support for X-Forwarded-Proto header field #413Nicolas Lœuillet2014-02-031-1/+3
| * [add] link to test file when we install wallabag #392Nicolas Lœuillet2014-02-032-1/+4
| * [fix] #421 Tables content in solarized themes unreadableNicolas Lœuillet2014-02-032-2/+4
| * Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-devNicolas Lœuillet2014-02-032-12/+18
| |\
| | * fix of bug #368 Endless redirects or user doesn't exist with basic authentica...Maryana Rozhankivska2014-01-302-12/+18
| * | [fix] courgette theme: Old constant call, replaced by the new one.Lonnytunes2014-02-021-1/+1
| * | [del] courgette theme: Useless templates because they are identical to those ...Lonnytunes2014-02-025-37/+0
| |/
| * some fix to courgette themeNicolas Lœuillet2014-01-2811-50/+94
| * changed some poche with wallabagNicolas Lœuillet2014-01-286-10/+10
| * Merge branch 'extraction-with-basic-auth' of git://github.com/aaa2000/poche i...Nicolas Lœuillet2014-01-281-4/+17
| |\
| | * add basic auth in file_get_contents for content extraction when user use basi...adev2014-01-121-4/+17
| | * [add] display token and user idNicolas Lœuillet2014-01-121-0/+2
| * | [fix] inthepoche.com => wallabag.orgNicolas Lœuillet2014-01-2813-23/+23
| * | [fix] change twitter account for sharing entryNicolas Lœuillet2014-01-282-4/+4
| * | poche is dead, welcome wallabagNicolas Lœuillet2014-01-2816-106/+45
| * | Merge pull request #410 from Lonnytunes/devNicolas Lœuillet2014-01-211-1/+1
| |\ \
| | * | [fix] Stops multiplication, in database, of a same user config item (error of...Lonnytunes2014-01-201-1/+1
| |/ /
| * / [add] display token and user idNicolas Lœuillet2014-01-101-0/+2
| |/
| * Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2014-01-081-3/+3
| |\
| | * Merge pull request #391 from Newinx/masterNicolas Lœuillet2014-01-071-3/+3
| | |\
| | | * Correction de bugs dans le schema mysqlPierre2014-01-071-3/+3
| * | | [add] courgette themeNicolas Lœuillet2014-01-0856-0/+1181
| |/ /
| * | [add] import from poche, thank you @tsadiq #388Nicolas Lœuillet2014-01-073-3/+53
* | | poche -> wallabagNicolas Lœuillet2014-01-281-23/+4
| |/ |/|
* | Merge pull request #387 from inthepoche/dev1.3.1Nicolas Lœuillet2014-01-0733-103/+117
|\|
| * [add] user_agent in file_get_contentsNicolas Lœuillet2014-01-071-1/+3
| * Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2014-01-071-2/+2
| |\
| | * Merge pull request #381 from tcitworld/devNicolas Lœuillet2014-01-061-2/+2
| | |\
| | | * Fixes bug 359Thomas Citharel2014-01-041-2/+2
| | | * Merge pull request #1 from inthepoche/devtcitworld2014-01-04920-8107/+32235
| | | |\
| * | | | [change] poche logo is now at SVG format, see #373Nicolas Lœuillet2014-01-076-1/+9
| |/ / /
| * | | [change] update poche version in compatibility test fileNicolas Lœuillet2014-01-061-1/+1
| * | | Merge pull request #382 from aaa2000/table_tags_entries_already_existsNicolas Lœuillet2014-01-051-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Create sqlite table tags_entries only if not already existsadev2014-01-051-1/+1
| |/ /
| * | Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2014-01-031-3/+3
| |\ \
| | * \ Merge pull request #380 from F1reF0x/devNicolas Lœuillet2014-01-031-3/+3
| | |\ \
| | | * | Change Permissions in pochePictures.phpFireFox2014-01-031-3/+3
| * | | | [fix] #375 Readability.com changed its export formatNicolas Lœuillet2014-01-031-25/+28
| |/ / /
| * | | [fix] code display when printing a page was buggyNicolas Lœuillet2014-01-031-0/+4
| * | | [del] remove inthepoche.com config file, website has changedNicolas Lœuillet2014-01-031-7/+0
| * | | [add] config file for interviewmagazine.comNicolas Lœuillet2014-01-031-0/+4
| * | | [fix] bugs #374 and #376 - encoding in rssNicolas Lœuillet2014-01-031-1/+1
| * | | Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2014-01-0319-59/+59
| |\ \ \
| | * \ \ Merge pull request #379 from williamtheaker/devNicolas Lœuillet2014-01-022-16/+16
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Updated config pageWilliam Theaker2014-01-021-11/+11
| | | * | Updated tag edit pageWilliam Theaker2014-01-021-5/+5
| | |/ /
| | * | Merge pull request #370 from DmitrySandalov/devNicolas Lœuillet2013-12-2817-43/+43
| | |\ \
| | | * | docs link, typosDmitry Sandalov2013-12-2817-43/+43
| | |/ /