345 commits

Author	SHA1	Message	Date
Thomas Citharel	dc6ec98758	just a reminder	2015-02-13 19:14:56 +01:00
Thomas Citharel	6cb5e1c9f5	improvements to internal registration and translations	2015-02-13 19:10:22 +01:00
Thomas Citharel	57068585c0	Merge branch 'dev' into sendmailatregistration	2015-02-13 17:14:08 +01:00
Eric Priou aka erixtekila	fde4cf0616	Fix fetched entries when localized	2015-02-05 14:19:03 +01:00
Thomas Citharel	571b99e804	added evernote support	2015-02-04 23:50:33 +01:00
Thomas Citharel	1c91178932	fix autoclose (#984) and bookmarklet mode	2015-02-04 23:37:37 +01:00
Thomas Citharel	89637c2a1d	added reload icon and fixed a bug where random could redirect to deleted articles	2015-02-01 12:22:14 +01:00
Thomas Citharel	d4b6e20e2f	merge	2015-02-01 12:05:10 +01:00
Thomas Citharel	c416cab8c9	Merge branch 'dev' into randomarticle	2015-02-01 11:33:41 +01:00
Thomas Citharel	b05f482dd2	Merge branch 'dev' into reloadarticle	2015-02-01 11:27:10 +01:00
Thomas Citharel	3829c54bc5	fix for special caracters in .mobi filenames	2015-01-26 17:44:52 +01:00
Thomas Citharel	42ac69337f	fix for spaces in .mobi filenames	2015-01-26 00:16:14 +01:00
Thomas Citharel	1be071f9f0	fix syntax errors	2015-01-24 15:43:45 +01:00
Thomas Citharel	3e1daa4c90	allow to send confirmation emails when creating a new user	2015-01-24 15:09:18 +01:00
Thomas Citharel	a3a9e75e62	correct a bug when email was not sended when creating a new user	2015-01-24 14:35:03 +01:00
Thomas Citharel	9a490ad63a	from spaces to commas	2015-01-20 00:02:21 +01:00
Thomas Citharel	fa921eac00	Merge branch 'kaffeeringe-patch-1' into dev	2015-01-19 23:32:01 +01:00
Thomas Citharel	1cedeb681f	(kind of) fix for #1011 and little corrections for PDF export	2015-01-19 23:19:09 +01:00
kaffeeringe	3052cfb7ca	Add Tags on Import ... I fixed it! And it works for me. But: I am not too good with programming. So better check the code ;-)	2015-01-18 21:49:05 +01:00
Nicolas Lœuillet	170a1407fe	Merge pull request #690 from doc75/log_auth_error ... Add message in web server log in case of authentication failure	2015-01-16 20:06:57 +01:00
Vincent Malley	7fe8a9adc4	[RSS] introducing query param 'limit' to restrict the number of items to display in RSS feeds.	2015-01-16 11:42:39 -05:00
moparisthebest	13c7f9a462	Add ability to mark all articles from a tag as read	2015-01-12 19:52:41 -05:00
moparisthebest	512e5e5bd1	Add ability to delete all articles matching a search	2015-01-12 19:52:41 -05:00
moparisthebest	7f782e4496	Add ability to tag an article on creation	2015-01-12 19:52:41 -05:00
Guillaume Virlet	c86b40f014	add message in web server log in case of authentication failure to enable the usage of fail2ban on failed login attempts	2015-01-05 10:21:04 +01:00
Thomas Citharel	82978fbd57	Merge branch 'master' into dev ... To get the errors	2015-01-03 11:38:32 +01:00
Thomas Citharel	37cad52229	don't call flattr if flattr is disabled	2014-12-22 16:26:23 +01:00
Thomas Citharel	e51487f932	implemented ?random url	2014-12-22 16:19:29 +01:00
Thomas Citharel	f3917b1ee4	Merge branch 'dev' into randomarticle	2014-12-22 14:33:01 +01:00
Jean Baptiste Favre	81315897f0	Make call to FTRSS silent to avoid warnings which can break import	2014-12-21 22:41:04 +01:00
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	311baf86be	implemented random button	2014-12-07 23:36:35 +01:00
Thomas Citharel	7c2c49d9b1	added diaspora sharing	2014-12-06 18:42:29 +01:00
Nicolas Lœuillet	85c5a1ff8d	failover if theme folder doesn't exist	2014-11-24 13:11:57 +01:00
Thomas Citharel	e9d4d17693	fix merge confict	2014-11-19 16:54:28 +01:00
Thomas Citharel	d25a3f13c2	default deactivated	2014-11-19 16:40:02 +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	ca6c0de380	Adjusting Template class so that _global is ignored as a theme	2014-11-17 17:11:33 -05:00
Nicolas Lœuillet	3c133bff49	add about page	2014-11-03 07:44:56 +01:00
Jay Sitter	bbbda080bf	Adding 'en_US' locale (issue #901)	2014-10-30 15:32:00 -04:00
Nicolas Lœuillet	b40cd4e73f	Merge pull request #889 from wallabag/fix#871 ... Fix#871	2014-10-27 20:58:13 +01: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	606bea72e1	fix #882	2014-10-22 15:10:38 +02:00
Nicolas Lœuillet	8fd0512a3c	Merge pull request #848 from 11mariom/dev ... Add support for custom http port	2014-10-14 19:57:16 +02:00
Nicolas Lœuillet	5b16d508b5	Merge pull request #843 from rros/mysql-utf8mb4 ... Convert the MySQL charset to utf8mb4 to support the full range of unicode	2014-10-14 19:56:50 +02:00
tcit	ffcd442989	get up to date for merge	2014-09-28 17:31:02 +02:00