Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
* | | | | | Merge pull request #382 from aaa2000/table_tags_entries_already_exists | Nicolas Lœuillet | 2014-01-05 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Create sqlite table tags_entries only if not already exists | ||||
| * | | | | Create sqlite table tags_entries only if not already exists | adev | 2014-01-05 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2014-01-03 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #380 from F1reF0x/dev | Nicolas Lœuillet | 2014-01-03 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Change Permissions in pochePictures.php | ||||
| | * | | | | Change Permissions in pochePictures.php | FireFox | 2014-01-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory | ||||
* | | | | | | [fix] #375 Readability.com changed its export format | Nicolas Lœuillet | 2014-01-03 | 1 | -25/+28 |
|/ / / / / | |||||
* | | | | | [fix] code display when printing a page was buggy | Nicolas Lœuillet | 2014-01-03 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | [del] remove inthepoche.com config file, website has changed | Nicolas Lœuillet | 2014-01-03 | 1 | -7/+0 |
| | | | | | |||||
* | | | | | [add] config file for interviewmagazine.com | Nicolas Lœuillet | 2014-01-03 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | [fix] bugs #374 and #376 - encoding in rss | Nicolas Lœuillet | 2014-01-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2014-01-03 | 19 | -59/+59 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #379 from williamtheaker/dev | Nicolas Lœuillet | 2014-01-02 | 2 | -16/+16 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Minor changes to tag edit and config pages | ||||
| | * | | | | Updated config page | William Theaker | 2014-01-02 | 1 | -11/+11 |
| | | | | | | |||||
| | * | | | | Updated tag edit page | William Theaker | 2014-01-02 | 1 | -5/+5 |
| |/ / / / | |||||
| * | | | | Merge pull request #370 from DmitrySandalov/dev | Nicolas Lœuillet | 2013-12-28 | 17 | -43/+43 |
| |\ \ \ \ | | |_|_|/ | |/| | | | docs link, typos | ||||
| | * | | | docs link, typos | Dmitry Sandalov | 2013-12-28 | 17 | -43/+43 |
| |/ / / | |||||
* / / / | [fix] error in query to get entries and tags | Nicolas Lœuillet | 2014-01-03 | 1 | -2/+2 |
|/ / / | |||||
* | | | [fix] bug with queries when postgresql is used | Nicolas Lœuillet | 2013-12-23 | 1 | -2/+2 |
| | | | |||||
* | | | [add] availability to regenerate feed token | Nicolas Lœuillet | 2013-12-23 | 1 | -0/+1 |
| | | | |||||
* | | | [change] install doc | Nicolas Lœuillet | 2013-12-23 | 1 | -70/+1 |
| | | |