Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change static files | Nicolas Lœuillet | 2014-02-12 | 2 | -3/+3 |
| | |||||
* | Merge branch 'dev' of https://github.com/wallabag/wallabag into dev | Nicolas Lœuillet | 2014-02-12 | 36 | -156/+1343 |
|\ | |||||
| * | Merge pull request #439 from flolauck/master | Nicolas Lœuillet | 2014-02-10 | 6 | -1/+10 |
| |\ | | | | | | | Adding .htaccess files to prohibit access to critical directories, e.g., db/ | ||||
| | * | Adding .htaccess files to prohibit access to critical directories, e.g., db/ | Florian Lauck | 2014-02-10 | 5 | -0/+9 |
| | | | |||||
| | * | Merge pull request #427 from wallabag/dev1.4.0 | Nicolas Lœuillet | 2014-02-03 | 84 | -173/+1397 |
| | |\ | | | | | | | | | changelog 1.4 | ||||
| | * | | poche -> wallabag | Nicolas Lœuillet | 2014-01-28 | 1 | -23/+4 |
| | | | | |||||
| * | | | Merge pull request #435 from mariroz/dev | Nicolas Lœuillet | 2014-02-07 | 8 | -124/+1197 |
| |\ \ \ | | | | | | | | | | | Polish and Ukrainian translations added. Russian - updated. Plust 2 smal... | ||||
| | * | | | Polish and Ukrainian translations added. Russian - updated. Plust 2 small ↵ | Maryana Rozhankivska | 2014-02-07 | 8 | -124/+1197 |
| |/ / / | | | | | | | | | | | | | translation related fixes in code. | ||||
| * | | | Merge pull request #434 from thomaslebeau/theme-courgette | Nicolas Lœuillet | 2014-02-07 | 15 | -30/+135 |
| |\ \ \ | | | | | | | | | | | Theme courgette | ||||
| | * | | | [remove] fontello theme courgette | Thomas LEBEAU | 2014-02-07 | 4 | -23/+0 |
| | | | | | |||||
| | * | | | [add] maj theme courgette : ajout tag | Thomas LEBEAU | 2014-02-07 | 11 | -7/+135 |
| |/ / / | |||||
| * | | | Merge pull request #428 from mariroz/dev | Nicolas Lœuillet | 2014-02-04 | 8 | -0/+0 |
| |\ \ \ | | |_|/ | |/| | | all locale files re-compiled: fix of #416 Some language problems in the ... | ||||
| | * | | all locale files re-compiled: fix of #416 Some language problems in the ↵ | Maryana Rozhankivska | 2014-02-04 | 8 | -0/+0 |
| |/ / | | | | | | | | | | french Config Page | ||||
| * | | [fix] #389 Empty article title (blank title tag) | nicosomb | 2014-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | change README | Nicolas Lœuillet | 2014-02-12 | 1 | -1/+1 |
| | | | |||||
* | | | bug fix #430 - welcome to your wallabag | Nicolas Lœuillet | 2014-02-12 | 1 | -1/+1 |
| | | | |||||
* | | | bug fix #364 - RSS Feed URL problem with + sign | Nicolas Lœuillet | 2014-02-12 | 1 | -7/+3 |
|/ / | |||||
* | | [fix] Add support for X-Forwarded-Proto header field #413 | Nicolas Lœuillet | 2014-02-03 | 1 | -1/+3 |
| | | |||||
* | | [add] link to test file when we install wallabag #392 | Nicolas Lœuillet | 2014-02-03 | 2 | -1/+4 |
| | | |||||
* | | [fix] #421 Tables content in solarized themes unreadable | Nicolas Lœuillet | 2014-02-03 | 2 | -2/+4 |
| | | |||||
* | | Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev | Nicolas Lœuillet | 2014-02-03 | 2 | -12/+18 |
|\ \ | |||||
| * | | fix of bug #368 Endless redirects or user doesn't exist with basic ↵ | Maryana Rozhankivska | 2014-01-30 | 2 | -12/+18 |
| | | | | | | | | | | | | authentication | ||||
* | | | [fix] courgette theme: Old constant call, replaced by the new one. | Lonnytunes | 2014-02-02 | 1 | -1/+1 |
| | | | |||||
* | | | [del] courgette theme: Useless templates because they are identical to those ↵ | Lonnytunes | 2014-02-02 | 5 | -37/+0 |
|/ / | | | | | | | of default theme and so inherited from it. | ||||
* | | some fix to courgette theme | Nicolas Lœuillet | 2014-01-28 | 11 | -50/+94 |
| | | |||||
* | | changed some poche with wallabag | Nicolas Lœuillet | 2014-01-28 | 6 | -10/+10 |
| | | |||||
* | | Merge branch 'extraction-with-basic-auth' of git://github.com/aaa2000/poche ↵ | Nicolas Lœuillet | 2014-01-28 | 1 | -4/+17 |
|\ \ | | | | | | | | | | into aaa2000-extraction-with-basic-auth | ||||
| * | | add basic auth in file_get_contents for content extraction when user use ↵ | adev | 2014-01-12 | 1 | -4/+17 |
| | | | | | | | | | | | | basic auth | ||||
| * | | [add] display token and user id | Nicolas Lœuillet | 2014-01-12 | 1 | -0/+2 |
| | | | |||||
* | | | [fix] inthepoche.com => wallabag.org | Nicolas Lœuillet | 2014-01-28 | 13 | -23/+23 |
| | | | |||||
* | | | [fix] change twitter account for sharing entry | Nicolas Lœuillet | 2014-01-28 | 2 | -4/+4 |
| | | | |||||
* | | | poche is dead, welcome wallabag | Nicolas Lœuillet | 2014-01-28 | 16 | -106/+45 |
| | | | |||||
* | | | Merge pull request #410 from Lonnytunes/dev | Nicolas Lœuillet | 2014-01-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix: stops multiplication, in database, of a same user config item | ||||
| * | | | [fix] Stops multiplication, in database, of a same user config item (error ↵ | Lonnytunes | 2014-01-20 | 1 | -1/+1 |
|/ / / | | | | | | | | | | of variable name). | ||||
* / / | [add] display token and user id | Nicolas Lœuillet | 2014-01-10 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2014-01-08 | 1 | -3/+3 |
|\ \ | |||||
| * \ | Merge pull request #391 from Newinx/master | Nicolas Lœuillet | 2014-01-07 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Correction de bugs dans le schema mysql | ||||
| | * | | Correction de bugs dans le schema mysql | Pierre | 2014-01-07 | 1 | -3/+3 |
| | |/ | | | | | | | | | | | | | - users/name type de int a varchar - valeurs par defaut ajoutees pour entries/is_read et is_fav | ||||
| | * | Merge pull request #387 from inthepoche/dev1.3.1 | Nicolas Lœuillet | 2014-01-07 | 33 | -103/+117 |
| | |\ | | | | | | | | | poche 1.3.1 | ||||
| | * \ | Merge pull request #363 from inthepoche/dev1.3.0 | Nicolas Lœuillet | 2013-12-23 | 880 | -7904/+31567 |
| | |\ \ | | | | | | | | | | | poche 1.3.0 | ||||
| | * | | | Update INSTALL.md | Nicolas Lœuillet | 2013-12-19 | 1 | -70/+1 |
| | | | | | |||||
* | | | | | [add] courgette theme | Nicolas Lœuillet | 2014-01-08 | 56 | -0/+1181 |
|/ / / / | |||||
* | | / | [add] import from poche, thank you @tsadiq #388 | Nicolas Lœuillet | 2014-01-07 | 3 | -3/+53 |
| |_|/ |/| | | |||||
* | | | [add] user_agent in file_get_contents | Nicolas Lœuillet | 2014-01-07 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2014-01-07 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge pull request #381 from tcitworld/dev | Nicolas Lœuillet | 2014-01-06 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | Flattr Class : Bug 359 | ||||
| | * | | | Fixes bug 359 | Thomas Citharel | 2014-01-04 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge pull request #1 from inthepoche/dev | tcitworld | 2014-01-04 | 920 | -8107/+32235 |
| | |\ \ \ | | | | | | | | | | | | | Dev | ||||
* | | | | | | [change] poche logo is now at SVG format, see #373 | Nicolas Lœuillet | 2014-01-07 | 6 | -1/+9 |
|/ / / / / | |||||
* | | | | | [change] update poche version in compatibility test file | Nicolas Lœuillet | 2014-01-06 | 1 | -1/+1 |
| | | | | |