126 Commits

Author	SHA1	Message	Date
Nicolas Lœuillet	b084cde854	Merge pull request #216 from NumEricR/css-icons ... Move icon's no-repeat to common code and clean CSS	2013-09-10 21:43:46 -07:00
Nicolas Lœuillet	8ca368e7e3	fix flattr span	2013-09-11 06:40:29 +02:00
NumEricR	a0fd7c5b44	Format CSS code	2013-09-10 23:54:40 +02:00
NumEricR	7eb64927cc	Move icons no-repeat into common style	2013-09-10 23:54:18 +02:00
Nicolas Lœuillet	9074534c93	fix flattr span	2013-09-10 22:19:34 +02:00
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
Nicolas Lœuillet	d11e2bcf48	change doc url	2013-09-10 15:46:05 +02:00
Nicolas Lœuillet	eaf2c769be	Merge branch 'dev' of https://github.com/inthepoche/poche into dev	2013-09-10 14:44:59 +02:00
Nicolas Lœuillet	ce4a1dcc19	changes to add url directly from poche	2013-09-10 14:41:58 +02:00
Nicolas Lœuillet	2230a38cd6	Merge pull request #205 from NumEricR/less-is-more ... Less is more :-)	2013-09-09 05:01:58 -07: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	d5ce28df67	Fixed bugs due to migration	2013-09-08 21:26:30 +02:00
Thomas Citharel	693b3f8677	Implemented Add Button ... Added a button to add an URL when directly into Poche. If JS isn't enabled, nothing happens.	2013-09-08 21:07:59 +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
NumEricR	2edde7fe33	Display sort links only if there is at least 2 articles in current list	2013-09-05 22:16:36 +02:00
NumEricR	08a12b6dbb	Hide disabled pagination links	2013-09-05 22:01:15 +02:00
NumEricR	876bb3af42	Remove on login and home views useless link "back to home"	2013-09-03 23:56:37 +02:00
NumEricR	7f9f5281e5	Add number of results next to pager	2013-08-28 21:23:26 +02:00
NumEricR	3eb049036e	Add warning message when there is no entry in current view	2013-08-27 16:03:50 +02:00
Nicolas Lœuillet	b6b36e1b5a	fix bug #182: Wrong title on favorites and archives pages	2013-08-26 17:18:08 +02:00
Nicolas Lœuillet	07a5909d73	Merge branch 'dev' of github.com:inthepoche/poche into dev	2013-08-25 20:10:34 +02:00
Nicolas Lœuillet	fccd59e2e3	fix display message for import	2013-08-25 20:08:07 +02:00
NumEricR	e6ba035911	Add bookmarklet id in config page	2013-08-25 16:57:37 +02:00
NumEricR	8e1ed353bb	Externalize top link style	2013-08-25 16:42:04 +02:00
NumEricR	a4990dd294	Externalize bookmarklet style	2013-08-25 16:42:04 +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
Nicolas Lœuillet	e6a8dd60af	Merge pull request #169 from NumEricR/entries-height ... Entries height with short description	2013-08-24 22:44:09 -07:00
Nicolas Lœuillet	1cbd70639c	Merge pull request #170 from NumEricR/login-button ... Login button	2013-08-24 22:43:16 -07:00
EliasZ	db4767e22b	config template its import section reflects defines	2013-08-24 16:03:49 +02:00
NumEricR	06cf8fb963	Fix login button wording	2013-08-24 10:27:33 +02:00
NumEricR	6a7d779024	Fix issue on entries' height	2013-08-24 09:56:59 +02:00
NumEricR	5ae45084dc	CSS clean up again	2013-08-24 09:53:02 +02:00
Nicolas Lœuillet	38b418b7d6	resolve conflicts	2013-08-23 23:18:36 +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
Nicolas Lœuillet	d29b3e5f9e	changes in md files	2013-08-23 23:04:56 +02:00
nicofrand	cb844c4238	Restore config modifications related to #162	2013-08-23 22:52:37 +02:00
nicofrand	258d7032bb	Clean up the templates markup	2013-08-23 22:38:14 +02:00
Nicolas Lœuillet	6d7defc87c	new messages when update / install	2013-08-23 22:24:41 +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	12c9c72984	text in shaarli link	2013-08-23 22:05:14 +02:00
Nicolas Lœuillet	cf9e886076	encode url to share with twitter / email / shaarli	2013-08-23 22:04:09 +02:00
Nicolas Lœuillet	3008e36a3e	fix bug #162 links to firefox / chrome / android apps	2013-08-23 22:01:17 +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