1192 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Thomas Citharel	444f140639	wow. Many changes to installation script. Much easier.	2015-01-25 17:43:58 +01:00
Thomas Citharel	e25972f830	Merge branch 'dev' of github.com:wallabag/wallabag into dev	2015-01-24 14:35:36 +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
Nicolas Lœuillet	0d36d2af95	Merge pull request #1019 from wallabag/revert-1018-fix-share-email-body-dev ... Revert "URL encode 'via @wallabagapp' email body"	2015-01-22 06:17:41 +01:00
Nicolas Lœuillet	e56ef77464	Revert "URL encode 'via @wallabagapp' email body"	2015-01-22 06:17:33 +01:00
Thomas Citharel	4c76ad6edf	Merge pull request #1018 from shtrom/fix-share-email-body-dev ... URL encode 'via @wallabagapp' email body	2015-01-22 00:52:56 +01:00
Olivier Mehani	64364606dd	URL encode 'via @wallabagapp' email body ... Signed-off-by: Olivier Mehani <olivier.mehani@nicta.com.au>	2015-01-22 10:36:21 +11:00
Thomas Citharel	cdde19d609	Merge pull request #1013 from wallabag/importtags ... Importtags	2015-01-20 00:07:57 +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	5537bb3216	remove autoload section in composer.json	2015-01-16 21:09:22 +01:00
Nicolas Lœuillet	894cd087f4	remove autoload section in composer.json	2015-01-16 20:56:46 +01:00
Nicolas Lœuillet	44f1fef018	packagist	2015-01-16 20:45:23 +01:00
Nicolas Lœuillet	b6ab520058	Merge pull request #1004 from wallabag/packagist ... Fixed #993: add wallabag to packagist	2015-01-16 20:36:03 +01:00
Nicolas Lœuillet	4cc328edf0	Fixed #993: add wallabag to packagist	2015-01-16 20:35:25 +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
Nicolas Lœuillet	b68f0a81e5	Merge pull request #1003 from vpmalley/dev ... [RSS] introducing query param 'limit' for max items in RSS feed	2015-01-16 20:04:56 +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
Thomas Citharel	af5c371e95	Merge pull request #999 from moparisthebest/additions_dev ... Miscellaneous additions	2015-01-13 22:45:33 +01: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	8ae45e7fe2	fixes #963 and use our own readability.php file for mobiClass	2015-01-03 13:03:26 +01:00
Thomas Citharel	166ff0a093	updated french mo file (see #986)	2015-01-03 11:40:19 +01:00
Thomas Citharel	82978fbd57	Merge branch 'master' into dev ... To get the errors	2015-01-03 11:38:32 +01:00
Nicolas Lœuillet	1186b3b67a	Merge pull request #986 from goofy-bz/patch-2 ... Update fr_FR.utf8.po	2015-01-02 21:23:42 +01:00
goofy-bz	30b948e68b	Update fr_FR.utf8.po ... formulation (trivial)	2015-01-02 21:13:54 +01:00
Thomas Citharel	1aa1461a2e	Merge pull request #974 from jbfavre/fix_ftrss_call_can_break_import ... Make call to FTRSS silent to avoid warnings which can break import	2014-12-26 10:31:15 +01:00
Thomas Citharel	92ae99bd29	Merge branch 'dev' of https://github.com/wallabag/wallabag into dev	2014-12-26 10:27:30 +01:00
Thomas Citharel	d4d33a4130	deleted (again) courgette	2014-12-26 10:25:49 +01:00
Nicolas Lœuillet	7a21c308be	Merge pull request #975 from wallabag/fixflattrcalls ... don't call flattr if flattr is disabled	2014-12-23 15:34:05 +01:00
Thomas Citharel	37cad52229	don't call flattr if flattr is disabled	2014-12-22 16:26:23 +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	9254b6cf46	Merge pull request #971 from wallabag/fix-jquery-installation ... Fix jquery installation	2014-12-19 21:06:06 +01:00
Nicolas Loeuillet	0e65fa85d3	remove idea files	2014-12-18 10:37:17 +01:00
Nicolas Loeuillet	4eb71ab555	change jquery path into installation script	2014-12-18 10:36:47 +01:00
Thomas Citharel	e9a64ef8a9	Merge pull request #923 from wallabag/add-html-doc ... add HTML documentation	2014-12-17 22:59:28 +01:00
Thomas Citharel	a50d7f0f20	link to doc inside wallabag:about	2014-12-17 22:55:33 +01:00
Thomas Citharel	2903ffc54f	Merge branch 'add-html-doc' of https://github.com/wallabag/wallabag into documentation-integration	2014-12-17 22:44:36 +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	1256e4c645	Merge branch 'tcitworld-ebook' into dev	2014-12-14 00:16:39 +01:00
Thomas Citharel	dc69d3e8d8	merge epub with all the dev evolutions	2014-12-14 00:16:22 +01:00
Thomas Citharel	9c55ed0923	diaspora on all themes	2014-12-07 22:24:25 +01:00
Thomas Citharel	7c2c49d9b1	added diaspora sharing	2014-12-06 18:42:29 +01:00
Thomas Citharel	41bd2be68a	Merge pull request #958 from etiess/patch-2 ... Update wallabag_compatibility_test.php	2014-11-26 14:08:51 +01:00
etiess	66d7a4dcd8	Update wallabag_compatibility_test.php ... Explain how to install Tidy	2014-11-26 14:07:27 +01:00
Thomas Citharel	b9c026ce32	Merge branch 'remove-courgette' into dev ... Conflicts: themes/courgette/_view.twig	2014-11-24 22:56:10 +01:00