127 commits

Author	SHA1	Message	Date
Thomas Citharel	3dcd85c075	merge	2014-12-19 21:08:44 +01:00
Thomas Citharel	5ea5310ab4	enable showing or not for epub/mobi/pdf export buttons	2014-12-14 15:17:39 +01:00
Thomas Citharel	dc69d3e8d8	merge epub with all the dev evolutions	2014-12-14 00:16:22 +01:00
Thomas Citharel	44b95cb81d	added reload function	2014-12-13 22:56:30 +01:00
Thomas Citharel	9c55ed0923	diaspora on all themes	2014-12-07 22:24:25 +01:00
Nicolas Lœuillet	485d57972e	Merge pull request #939 from jsit/globaljs ... _global-izing some more js & css	2014-11-24 13:23:53 +01:00
Jay Sitter	fc01f94387	Globalizing and creating two variants of Carrot.org icon; tidying up some CSS	2014-11-21 15:30:59 -05:00
Thomas Citharel	e9d4d17693	fix merge confict	2014-11-19 16:54:28 +01:00
Thomas Citharel	b13376e918	fix Flattrs	2014-11-19 16:35:44 +01:00
Thomas Citharel	c8b4ef7fed	implementing carrot into wallabag	2014-11-19 16:27:56 +01:00
Jay Sitter	eb365a01fb	_global-izing some more js & css	2014-11-18 10:01:37 -05:00
Jay Sitter	eb0c88a9d4	Fix for favicons in Firefox (FF only uses the last declared favicon, not the most appropriate: https://bugzilla.mozilla.org/show_bug.cgi?id=751712)	2014-11-18 09:28:39 -05:00
Jay Sitter	9d2140c9a1	Fixing earlier commit wherein I lowercased some JS calls	2014-11-17 16:54:15 -05:00
Jay Sitter	7a0f454d39	Removing app icons from previous locations	2014-11-17 16:51:38 -05:00
Jay Sitter	d5b717dc77	Moving app icon images to /themes/_global/img/appicon/, updating Baggy and Default themes to point there	2014-11-17 16:49:34 -05:00
Jay Sitter	62f3e6db75	Fixing URL typo on about page	2014-11-05 11:22:22 -05:00
Thomas Citharel	217f3ca0b4	Merge pull request #921 from wallabag/about-page ... add about page	2014-11-03 23:01:23 +01:00
Nicolas Lœuillet	3eba7538a4	Merge pull request #920 from jsit/uifixes ... Many small UI changes/fixes to Baggy theme and English translation files	2014-11-03 22:48:07 +01:00
Jay Sitter	efd0a9f5f1	Applying changes to config.twig to default theme as well	2014-11-03 12:06:44 -05:00
Nicolas Lœuillet	3c133bff49	add about page	2014-11-03 07:44:56 +01:00
Jay Sitter	ff02fd8aca	Improving JavaScript for popup forms	2014-11-02 11:19:21 -05:00
Jay Sitter	8519cc796f	Moving search-form style out of messages css and into style.css	2014-10-31 12:31:13 -04:00
tcit	1b6e21d7a6	translation fix finished for #871 and bring add tag from search feature to all themes	2014-10-27 15:12:46 +01:00
tcit	7ee1972599	translation fix for #887 and tiny display fix	2014-10-27 14:00:47 +01:00
tcit	48fb171d7a	fix for #830	2014-10-15 16:47:38 +02:00
tcit	40d2042228	small fix for better width for search translations full display	2014-10-04 19:08:56 +02:00
tcit	1cd02d55fb	autofocus on all themes	2014-10-04 18:51:43 +02:00
tcit	f183f72bf4	Merge branch 'dev' into saveclick2search	2014-10-04 18:47:56 +02:00
tcit	8b6c710b09	fixed bug in config screen for default theme	2014-10-04 18:45:43 +02:00
tcit	04b589420e	search field selected	2014-10-04 18:44:18 +02:00
tcit	ffcd442989	get up to date for merge	2014-09-28 17:31:02 +02:00
Thomas Citharel	8763e4efde	Fix downloading SQLite database from all users	2014-08-26 12:43:56 +02:00
Thomas Citharel	1daa8e4a0f	merge fix 776	2014-08-16 00:54:46 +02:00
tcit	280972a66c	changes in all themes	2014-07-26 12:44:55 +02:00
tcit	200c758ff4	Translations	2014-07-26 12:42:48 +02:00
tcit	8492f37323	translation stuff (en & fr done)	2014-07-26 12:22:33 +02:00
Nicolas Lœuillet	505a74ad1d	Merge branch 'dev' into refactor ... Conflicts: check_setup.php index.php	2014-07-23 13:42:30 +02:00
Maryana Rozhankivska	9f8541ef2a	highlight.js library added to highlight programming code examples in article view	2014-07-22 20:17:15 +03:00
Nicolas Lœuillet	b738bea9ca	Fix #776	2014-07-22 16:37:13 +02:00
Nicolas Lœuillet	d423113b00	#683 Rename « home » into « unread »	2014-07-12 21:50:29 +02:00
Nicolas Lœuillet	2f26729c84	Refactor	2014-07-12 19:01:11 +02:00
Maryana Rozhankivska	009669360d	fix of onmouseover displaying of wallbabag a link in wallabag form in default theme	2014-05-24 11:21:43 +03:00
Maryana Rozhankivska	a342945b61	fix of rearch form popup in default theme	2014-05-24 11:08:39 +03:00
tcit	404adf970d	Merge branch 'epub' into dev ... Conflicts: themes/baggy/home.twig	2014-05-16 16:31:18 +02:00
tcit	74e09e562b	better wallabag in wallabag button (see #685)	2014-05-16 15:34:13 +02:00
tcit	f3f0b11393	Better names for epub files and epub in all themes now	2014-05-15 15:42:36 +02:00
tcit	07da861126	Added multi-user functionnality in all themes	2014-04-23 10:53:57 +02:00
Maryana Rozhankivska	c2cf7075c2	print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view	2014-04-22 10:45:09 +03:00
Nicolas Lœuillet	f8e9d8bdbc	[fix] Escap key displays save a link form #612	2014-04-08 22:10:40 +02:00
Nicolas Lœuillet	3945335f39	can't close search popup with the cross picture #613	2014-04-08 21:58:44 +02:00