Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr | Nicolas Lœuillet | 2013-09-10 | 3 | -0/+6 |
|\ | | | | | | | | | Conflicts: inc/3rdparty/site_config | ||||
| * | Fixed bugs, added a flattr button and an option | Thomas Citharel | 2013-09-10 | 3 | -1/+6 |
| | | | | | | | | | | There's a button and an option in define.inc.php to show the button or not. | ||||
| * | Fixed errors and changed source of flattrs | Thomas Citharel | 2013-09-08 | 1 | -1/+1 |
| | | | | | | | | | | Fixed errors, and the number displayed is no longer the number of peope who has flattred an article, but the number of flattrs he has got. | ||||
| * | Implemented Flattr changes | Thomas Citharel | 2013-09-08 | 1 | -0/+1 |
| | | | | | | | | | | Added a button to say if the article is flattrable or not and how many people have flattred this object. | ||||
* | | change doc url | Nicolas Lœuillet | 2013-09-10 | 3 | -6/+6 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/inthepoche/poche into dev | Nicolas Lœuillet | 2013-09-10 | 3 | -13/+36 |
|\ \ | |||||
| * \ | Merge pull request #205 from NumEricR/less-is-more | Nicolas Lœuillet | 2013-09-09 | 3 | -7/+8 |
| |\ \ | | | | | | | | | Less is more :-) | ||||
| | * | | Display sort links only if there is at least 2 articles in current list | NumEricR | 2013-09-05 | 1 | -0/+2 |
| | | | | |||||
| | * | | Hide disabled pagination links | NumEricR | 2013-09-05 | 1 | -6/+1 |
| | | | | |||||
| | * | | Remove on login and home views useless link "back to home" | NumEricR | 2013-09-03 | 1 | -1/+5 |
| | |/ | |||||
| * / | Add number of results next to pager | NumEricR | 2013-08-28 | 2 | -5/+27 |
| |/ | |||||
* | | changes to add url directly from poche | Nicolas Lœuillet | 2013-09-10 | 4 | -19/+12 |
| | | |||||
* | | Fixed bugs due to migration | Thomas Citharel | 2013-09-08 | 2 | -12/+11 |
| | | |||||
* | | Implemented Add Button | Thomas Citharel | 2013-09-08 | 4 | -1/+26 |
|/ | | | | | Added a button to add an URL when directly into Poche. If JS isn't enabled, nothing happens. | ||||
* | Add warning message when there is no entry in current view | NumEricR | 2013-08-27 | 1 | -2/+6 |
| | |||||
* | fix bug #182: Wrong title on favorites and archives pages | Nicolas Lœuillet | 2013-08-26 | 1 | -1/+9 |
| | |||||
* | Merge branch 'dev' of github.com:inthepoche/poche into dev | Nicolas Lœuillet | 2013-08-25 | 3 | -2/+23 |
|\ | |||||
| * | Add bookmarklet id in config page | NumEricR | 2013-08-25 | 1 | -1/+1 |
| | | |||||
| * | Externalize top link style | NumEricR | 2013-08-25 | 2 | -1/+15 |
| | | |||||
| * | Externalize bookmarklet style | NumEricR | 2013-08-25 | 2 | -1/+8 |
| | | |||||
* | | fix display message for import | Nicolas Lœuillet | 2013-08-25 | 1 | -3/+3 |
|/ | |||||
* | title page in article view was wrong | Nicolas Lœuillet | 2013-08-25 | 1 | -1/+1 |
| | |||||
* | links to original article were wrong | Nicolas Lœuillet | 2013-08-25 | 1 | -2/+2 |
| | |||||
* | Merge pull request #169 from NumEricR/entries-height | Nicolas Lœuillet | 2013-08-24 | 1 | -8/+9 |
|\ | | | | | Entries height with short description | ||||
| * | Fix issue on entries' height | NumEricR | 2013-08-24 | 1 | -0/+4 |
| | | |||||
| * | CSS clean up again | NumEricR | 2013-08-24 | 1 | -8/+5 |
| | | |||||
* | | Merge pull request #170 from NumEricR/login-button | Nicolas Lœuillet | 2013-08-24 | 1 | -1/+1 |
|\ \ | | | | | | | Login button | ||||
| * | | Fix login button wording | NumEricR | 2013-08-24 | 1 | -1/+1 |
| |/ | |||||
* | | config template its import section reflects defines | EliasZ | 2013-08-24 | 1 | -3/+3 |
| | | |||||
* | | resolve conflicts | Nicolas Lœuillet | 2013-08-23 | 4 | -41/+38 |
|\ \ | |||||
| * | | Add SHAARLI support to view template | nicofrand | 2013-08-23 | 1 | -0/+2 |
| | | | |||||
| * | | Revert "Add SHAARLI support to view template" | Nicolas Frandeboeuf | 2013-08-23 | 31 | -2/+0 |
| | | | | | | | | | This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8. | ||||
| * | | Add SHAARLI support to view template | nicofrand | 2013-08-23 | 31 | -0/+2 |
| | | | |||||
| * | | Restore config modifications related to #162 | nicofrand | 2013-08-23 | 1 | -4/+8 |
| | | | |||||
| * | | Clean up the templates markup | nicofrand | 2013-08-23 | 4 | -31/+30 |
| | | | |||||
| * | | Revert "Clean markup in templates" | Nicolas Frandeboeuf | 2013-08-23 | 4 | -30/+31 |
| | | | | | | | | | | | | This reverts commit 8413a63f7d9df2695653ab2ef1d77927da6ddc55. | ||||
| * | | Clean markup in templates | Nicolas Frandeboeuf | 2013-08-23 | 4 | -31/+30 |
| | | | |||||
* | | | changes in md files | Nicolas Lœuillet | 2013-08-23 | 1 | -0/+2 |
| |/ |/| | |||||
* | | new messages when update / install | Nicolas Lœuillet | 2013-08-23 | 1 | -3/+2 |
| | | |||||
* | | text in shaarli link | Nicolas Lœuillet | 2013-08-23 | 1 | -2/+2 |
| | | |||||
* | | encode url to share with twitter / email / shaarli | Nicolas Lœuillet | 2013-08-23 | 1 | -4/+6 |
| | | |||||
* | | fix bug #162 links to firefox / chrome / android apps | Nicolas Lœuillet | 2013-08-23 | 1 | -4/+10 |
|/ | |||||
* | Merge branch 'dev' of github.com:inthepoche/poche into dev | Nicolas Lœuillet | 2013-08-23 | 3 | -25/+21 |
|\ | |||||
| * | Add textual content on tools links | NumEricR | 2013-08-23 | 3 | -16/+20 |
| | | |||||
| * | Fix HTML code of tools lists | NumEricR | 2013-08-23 | 2 | -25/+17 |
| | | |||||
* | | fix bug #151: HTML entities in titles are encoded twice | Nicolas Lœuillet | 2013-08-23 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #159 from NumEricR/css-cleanup | Nicolas Lœuillet | 2013-08-23 | 1 | -65/+55 |
|\ | | | | | CSS clean up on style.css file | ||||
| * | CSS clean up on style.css file | NumEricR | 2013-08-23 | 1 | -65/+55 |
| | | | | | | | | | | | | | | | | | | Syntax homogenization (spaces, lowercase for hexa, ...) Code refactoring Simplification of some selectors Simplification of "0px" and hexa values More detailed font stack Add cursor pointer on ".bouton" elements | ||||
* | | Fix #157 | Nicolas Frandeboeuf | 2013-08-23 | 2 | -0/+20 |
|/ | |||||
* | fix bug #112 link to shaarli | Nicolas Lœuillet | 2013-08-20 | 3 | -0/+6 |
| |