26 Commits

Author	SHA1	Message	Date
Nicolas Lœuillet	12d9cfbcaa	Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr ... Conflicts: inc/3rdparty/site_config	2013-09-10 19:22:47 +02:00
Thomas Citharel	964481d023	Fixed bugs, added a flattr button and an option ... There's a button and an option in define.inc.php to show the button or not.	2013-09-10 18:23:56 +02:00
Thomas Citharel	af1d279226	Fixed errors and changed source of flattrs ... 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.	2013-09-08 21:52:01 +02:00
Thomas Citharel	a322312740	Implemented Flattr changes ... Added a button to say if the article is flattrable or not and how many people have flattred this object.	2013-09-08 20:54:11 +02:00
Nicolas Lœuillet	3044b21eb6	title page in article view was wrong	2013-08-25 08:49:21 +02:00
Nicolas Lœuillet	d7e8dd590c	links to original article were wrong	2013-08-25 08:43:22 +02:00
nicofrand	fa5f9764ae	Add SHAARLI support to view template	2013-08-23 23:11:34 +02:00
Nicolas Frandeboeuf	fd99a8c02d	Revert "Add SHAARLI support to view template" ... This reverts commit 0269cd8213.	2013-08-23 23:09:43 +02:00
nicofrand	0269cd8213	Add SHAARLI support to view template	2013-08-23 23:05:45 +02:00
nicofrand	258d7032bb	Clean up the templates markup	2013-08-23 22:38:14 +02:00
Nicolas Frandeboeuf	f3e4f109a3	Revert "Clean markup in templates" ... This reverts commit 8413a63f7d.	2013-08-23 22:23:55 +02:00
Nicolas Frandeboeuf	8413a63f7d	Clean markup in templates	2013-08-23 22:20:04 +02:00
Nicolas Lœuillet	d9afe1abd7	Merge branch 'dev' of github.com:inthepoche/poche into dev	2013-08-23 21:15:39 +02:00
Nicolas Lœuillet	ffc966d72f	fix bug #151: HTML entities in titles are encoded twice	2013-08-23 21:06:45 +02:00
NumEricR	4b4afc7322	Add textual content on tools links	2013-08-23 18:45:34 +02:00
NumEricR	29773c9729	Fix HTML code of tools lists	2013-08-23 18:10:42 +02:00
Nicolas Lœuillet	38330bfd65	fix bug #112 link to shaarli	2013-08-20 11:23:00 +02:00
Nicolas Lœuillet	82051a6a6a	fixed #128: back to home after mark a link as read is fixed	2013-08-11 19:10:48 +02:00
Nicolas Lœuillet	fa0483b361	closed #120: top link	2013-08-10 12:21:36 +02:00
Nicolas Lœuillet	d28a7ca30f	remove js	2013-08-05 21:59:21 +02:00
Nicolas Lœuillet	6a361945ea	new design, pagination & more	2013-08-05 21:56:32 +02:00
Nicolas Lœuillet	55821e04c1	share email +twitter / class messages	2013-08-05 15:54:37 +02:00
Nicolas Lœuillet	a62788c61e	#100: welcome to you, instapaper users	2013-08-05 09:43:33 +02:00
Nicolas Lœuillet	2a1791a4b1	view of an article	2013-08-04 22:51:12 +02:00
Nicolas Lœuillet	3ba5f81b7b	twig implementation	2013-08-04 18:07:41 +02:00
Nicolas Lœuillet	d51ecb6ea8	ignore vendor	2013-08-04 17:35:02 +02:00