aboutsummaryrefslogtreecommitdiffhomepage
path: root/tpl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-FlattrNicolas Lœuillet2013-09-103-0/+6
|\ | | | | | | | | Conflicts: inc/3rdparty/site_config
| * Fixed bugs, added a flattr button and an optionThomas Citharel2013-09-103-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 flattrsThomas Citharel2013-09-081-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 changesThomas Citharel2013-09-081-0/+1
| | | | | | | | | | Added a button to say if the article is flattrable or not and how many people have flattred this object.
* | change doc urlNicolas Lœuillet2013-09-103-6/+6
| |
* | Merge branch 'dev' of https://github.com/inthepoche/poche into devNicolas Lœuillet2013-09-103-13/+36
|\ \
| * \ Merge pull request #205 from NumEricR/less-is-moreNicolas Lœuillet2013-09-093-7/+8
| |\ \ | | | | | | | | Less is more :-)
| | * | Display sort links only if there is at least 2 articles in current listNumEricR2013-09-051-0/+2
| | | |
| | * | Hide disabled pagination linksNumEricR2013-09-051-6/+1
| | | |
| | * | Remove on login and home views useless link "back to home"NumEricR2013-09-031-1/+5
| | |/
| * / Add number of results next to pagerNumEricR2013-08-282-5/+27
| |/
* | changes to add url directly from pocheNicolas Lœuillet2013-09-104-19/+12
| |
* | Fixed bugs due to migrationThomas Citharel2013-09-082-12/+11
| |
* | Implemented Add ButtonThomas Citharel2013-09-084-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 viewNumEricR2013-08-271-2/+6
|
* fix bug #182: Wrong title on favorites and archives pagesNicolas Lœuillet2013-08-261-1/+9
|
* Merge branch 'dev' of github.com:inthepoche/poche into devNicolas Lœuillet2013-08-253-2/+23
|\
| * Add bookmarklet id in config pageNumEricR2013-08-251-1/+1
| |
| * Externalize top link styleNumEricR2013-08-252-1/+15
| |
| * Externalize bookmarklet styleNumEricR2013-08-252-1/+8
| |
* | fix display message for importNicolas Lœuillet2013-08-251-3/+3
|/
* title page in article view was wrongNicolas Lœuillet2013-08-251-1/+1
|
* links to original article were wrongNicolas Lœuillet2013-08-251-2/+2
|
* Merge pull request #169 from NumEricR/entries-heightNicolas Lœuillet2013-08-241-8/+9
|\ | | | | Entries height with short description
| * Fix issue on entries' heightNumEricR2013-08-241-0/+4
| |
| * CSS clean up againNumEricR2013-08-241-8/+5
| |
* | Merge pull request #170 from NumEricR/login-buttonNicolas Lœuillet2013-08-241-1/+1
|\ \ | | | | | | Login button
| * | Fix login button wordingNumEricR2013-08-241-1/+1
| |/
* | config template its import section reflects definesEliasZ2013-08-241-3/+3
| |
* | resolve conflictsNicolas Lœuillet2013-08-234-41/+38
|\ \
| * | Add SHAARLI support to view templatenicofrand2013-08-231-0/+2
| | |
| * | Revert "Add SHAARLI support to view template"Nicolas Frandeboeuf2013-08-2331-2/+0
| | | | | | | | | This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8.
| * | Add SHAARLI support to view templatenicofrand2013-08-2331-0/+2
| | |
| * | Restore config modifications related to #162nicofrand2013-08-231-4/+8
| | |
| * | Clean up the templates markupnicofrand2013-08-234-31/+30
| | |
| * | Revert "Clean markup in templates"Nicolas Frandeboeuf2013-08-234-30/+31
| | | | | | | | | | | | This reverts commit 8413a63f7d9df2695653ab2ef1d77927da6ddc55.
| * | Clean markup in templatesNicolas Frandeboeuf2013-08-234-31/+30
| | |
* | | changes in md filesNicolas Lœuillet2013-08-231-0/+2
| |/ |/|
* | new messages when update / installNicolas Lœuillet2013-08-231-3/+2
| |
* | text in shaarli linkNicolas Lœuillet2013-08-231-2/+2
| |
* | encode url to share with twitter / email / shaarliNicolas Lœuillet2013-08-231-4/+6
| |
* | fix bug #162 links to firefox / chrome / android appsNicolas Lœuillet2013-08-231-4/+10
|/
* Merge branch 'dev' of github.com:inthepoche/poche into devNicolas Lœuillet2013-08-233-25/+21
|\
| * Add textual content on tools linksNumEricR2013-08-233-16/+20
| |
| * Fix HTML code of tools listsNumEricR2013-08-232-25/+17
| |
* | fix bug #151: HTML entities in titles are encoded twiceNicolas Lœuillet2013-08-232-2/+2
|/
* Merge pull request #159 from NumEricR/css-cleanupNicolas Lœuillet2013-08-231-65/+55
|\ | | | | CSS clean up on style.css file
| * CSS clean up on style.css fileNumEricR2013-08-231-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 #157Nicolas Frandeboeuf2013-08-232-0/+20
|/
* fix bug #112 link to shaarliNicolas Lœuillet2013-08-203-0/+6
|