2922 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nicolas Lœuillet	20bf78b935	Merge pull request #2389 from wallabag/add-info-publich-articles ... Added default picture if preview picture is null	2016-10-07 16:35:32 +02:00
Nicolas Lœuillet	499ba4cb2f	Merge pull request #2388 from wallabag/fix-2factor-user-admin ... Fixed two-factor checkbox display in user admin panel	2016-10-07 16:35:01 +02:00
Jeremy Benoist	aa88d2494b	Merge pull request #2385 from wallabag/add-doc-about-siteconfig ... Added documentation about siteconfig fix	2016-10-07 16:02:03 +02:00
Nicolas Lœuillet	4e5d219663	Fixed review	2016-10-07 15:27:05 +02:00
Nicolas Lœuillet	d5c45d5288	Added default picture if preview picture is null	2016-10-07 15:21:31 +02:00
Nicolas Lœuillet	fba816c43b	Added link to fivefilters website	2016-10-07 15:14:15 +02:00
Nicolas Lœuillet	5e7786f3c4	Fixed two-factor checkbox display in user admin panel ... Fix #2380	2016-10-07 14:56:26 +02:00
Nicolas Lœuillet	9cfea18a5d	Fixed review	2016-10-07 14:40:32 +02:00
Nicolas Lœuillet	c8d2dcdafe	Merge pull request #2383 from wallabag/add-info-publich-articles ... Added OpenGraph support for public articles	2016-10-07 14:30:46 +02:00
Nicolas Lœuillet	baf0ffa7df	Added documentation about siteconfig fix ... Found in #2358, thank you @j0k3r	2016-10-07 14:17:13 +02:00
Nicolas Lœuillet	21d82c3c5d	Added test for OpenGraph	2016-10-07 14:06:12 +02:00
Jeremy Benoist	bf71a734f6	Merge pull request #2332 from wallabag/tags-export ... Fix relations export for Entry	2016-10-07 13:55:55 +02:00
Nicolas Lœuillet	d0d196ffb3	Fixed review	2016-10-07 09:22:40 +02:00
Nicolas Lœuillet	f0d52417fb	Added OpenGraph support for public articles ... Fix #2289	2016-10-07 09:05:18 +02:00
Jeremy Benoist	74e1f7433a	Fix tag test	2016-10-07 07:43:48 +02:00
Jeremy Benoist	6c8806cadc	Fix bad translation key ... `entry_reload_failed` instead of `entry_reloaded_failed`	2016-10-07 07:43:48 +02:00
Jeremy Benoist	b0458874c8	Fix relations export for Entry ... Tags & Annotations weren’t really well exported. This is now fixed (+ tests)	2016-10-07 07:43:19 +02:00
Thomas Citharel	9d127b3b93	Merge pull request #2377 from wallabag/fix-exists-api ... Fix exists API call	2016-10-05 19:52:06 +02:00
Jeremy Benoist	0b174d69d7	Fix typo & add test	2016-10-05 19:30:56 +02:00
Jeremy Benoist	046f33e21b	Merge pull request #2374 from wallabag/clickable-tags ... Clickable tags	2016-10-05 16:16:21 +02:00
Thomas Citharel	145d69fe5d	Merge pull request #2375 from wallabag/upgrade-nodejs ... try to reduce assets build npm connection failing by updating nodejs	2016-10-05 15:38:19 +02:00
Thomas Citharel	5d39243068	Fix exists API call ... Boo	2016-10-05 15:28:36 +02:00
Thomas Citharel	3c00779dc3	try to reduce assets build npm connection failing by updating nodejs	2016-10-05 15:05:42 +02:00
Thomas Citharel	15f1352ef8	better tags on material	2016-10-05 14:06:55 +02:00
Nicolas Lœuillet	2fb9caeb2d	Merge pull request #2363 from wallabag/clean-composer ... Remove mouf/nodejs-installer from composer	2016-10-04 22:22:19 +02:00
Jeremy Benoist	1b1cb553be	Remove mouf/nodejs-installer from composer	2016-10-04 21:44:58 +02:00
Thomas Citharel	645c0d5bce	better tags on baggy	2016-10-04 20:11:10 +02:00
Nicolas Lœuillet	837247dea4	Update md5 hash for package	2016-10-04 17:43:28 +02:00
Nicolas Lœuillet	c36f5adce2	Merge pull request #2349 from wallabag/prepare-211 ... Prepare wallabag 2.1.1	2016-10-04 17:13:57 +02:00
Nicolas Lœuillet	933c6f3155	Update CHANGELOG.md	2016-10-04 17:13:16 +02:00
Jeremy Benoist	8ebb214ec4	Typo	2016-10-04 17:12:45 +02:00
Jeremy Benoist	954b6a36a3	Update CHANGELOG	2016-10-04 17:11:26 +02:00
Nicolas Lœuillet	5958597ba6	Prepare wallabag 2.1.1	2016-10-04 17:08:34 +02:00
Thomas Citharel	57386125ab	Merge pull request #2353 from wallabag/assets-fix ... Basically, fix everything	2016-10-04 16:26:50 +02:00
Thomas Citharel	c10adc1f76	typo and build on test	2016-10-04 15:59:56 +02:00
Thomas Citharel	6cb364a2c1	use airbnb base rules and update eslint	2016-10-04 15:30:05 +02:00
Thomas Citharel	f733d8aaa3	Fix icon position	2016-10-04 15:12:48 +02:00
Nicolas Lœuillet	3e85e91159	Fixed calendar icon position with baggy theme	2016-10-04 15:00:47 +02:00
Nicolas Lœuillet	0c7f1ba796	Fixed icon position in share menu	2016-10-04 14:58:06 +02:00
Thomas Citharel	46d78f87d9	fix icons	2016-10-04 14:48:22 +02:00
Nicolas Lœuillet	f2ab290f0f	Merge pull request #2359 from wallabag/user-config ... Create config even if user is disabled	2016-10-04 13:35:13 +02:00
Thomas Citharel	9f7d154e34	Add eslint & stylelint tests (fix a few things) and move dependencies to dev	2016-10-04 12:14:28 +02:00
Jeremy Benoist	9a6ac0b47a	👋 HHVM	2016-10-04 11:20:58 +02:00
Jeremy Benoist	755ff9e835	Create config even if user is disabled ... When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.	2016-10-04 10:42:46 +02:00
Jeremy Benoist	f440e28281	Update doc ... Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)	2016-10-04 10:31:03 +02:00
Jeremy Benoist	ca8f9bdc15	Fix font & Travis ... Grunt now copy fonts instead of symlink (node_modules won't exist for the end user)	2016-10-04 10:10:40 +02:00
Nicolas Lœuillet	f0b2d57154	Merge pull request #2354 from Zayon/master ... Add php-bcmath extension to requirements	2016-10-04 08:41:17 +02:00
Jeremy Benoist	9f3a1cd20c	shaarli instead of Diaspora	2016-10-04 07:26:18 +02:00
Jeremy Benoist	10f51f429d	Update .travis.yml	2016-10-04 07:25:05 +02:00
Thomas Citharel	96a99d4375	Fix grunt path	2016-10-04 01:00:14 +02:00