381 commits

Author	SHA1	Message	Date
Jeremy Benoist	eb2d613c3e	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-21 15:15:30 +01:00
Jeremy Benoist	625bb56181	Merge pull request #2624 from Rurik19/master ... Fix #2056 update config.yml	2016-11-21 13:14:31 +01:00
Nicolas Lœuillet	98253436e9	Prepare wallabag 2.1.5 🚀	2016-11-21 09:20:27 +01:00
Yuriy Evdokimov	05cdd393d8	wrong spaces	2016-11-21 11:29:09 +05:00
Yuriy Evdokimov	5e7fdfc8dd	Fix #2056 update config.yml ... Resolves refresh token lifetime issue	2016-11-21 11:13:40 +05:00
Jeremy Benoist	c1683778ab	Add ability to use Redis with password	2016-11-20 20:43:04 +01:00
Jeremy Benoist	3c969d3990	Add missing translations	2016-11-20 09:39:25 +01:00
Nicolas Lœuillet	995c204428	Added shortcut	2016-11-19 20:05:16 +01:00
Nicolas Lœuillet	32f455c131	Added tests	2016-11-19 20:05:16 +01:00
Nicolas Lœuillet	ee122a7528	Added a simple search engine ... Fix #18	2016-11-19 19:17:30 +01:00
Jeremy Benoist	68003139e1	Merge remote-tracking branch 'origin/master' into 2.2 ... # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js	2016-11-19 15:30:49 +01:00
Nicolas Lœuillet	8fdadee3a5	Change version to 2.2.0-dev	2016-11-19 14:28:25 +01:00
Nicolas Lœuillet	e10e6ab34e	Replace http status with a string ... I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters	2016-11-18 15:55:16 +01:00
Nicolas Lœuillet	10b3509757	Added http_status in Entry entity	2016-11-18 15:09:21 +01:00
Nicolas Lœuillet	5d2971cadd	Prepare wallabag 2.1.4 🚀	2016-11-18 10:00:29 +01:00
Jeremy Benoist	9e2440fe15	Fix migration	2016-11-17 08:05:15 +01:00
Nicolas Lœuillet	a42f38d9fb	Added a configuration to define the redirection after archiving an entry ... Fix #496	2016-11-16 23:07:34 +01:00
Nicolas Lœuillet	94f2057ffe	Added CSS class on links	2016-11-16 09:17:12 +01:00
Thomas Citharel	10a1ffae53	Fix keyboard navigation on quickstart view ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 22:23:50 +01:00
Thomas Citharel	c930992348	fix next/prev page	2016-11-15 21:55:16 +01:00
Thomas Citharel	5637a26e9a	Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! ... Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 21:55:10 +01:00
Nicolas Lœuillet	16ef7607f4	Reorganized JS folders for shortcuts	2016-11-15 21:54:50 +01:00
Thomas Citharel	af61cb80eb	es6 imports ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-15 21:54:41 +01:00
Nicolas Lœuillet	f9cded7dd2	Added new shortcuts	2016-11-15 21:54:34 +01:00
Nicolas Lœuillet	49c5d0ad6e	Changed FOSJSRouting format in config	2016-11-15 21:54:20 +01:00
Nicolas Lœuillet	3cc78f0679	Added shortcuts	2016-11-15 21:54:20 +01:00
Nicolas Lœuillet	80302e5aaa	Changed display for material theme	2016-11-14 13:58:41 +01:00
Nicolas Lœuillet	1c282b1da0	Added creation date on entries view	2016-11-14 13:57:31 +01:00
Nicolas Lœuillet	8a9604aafe	Added unmark.it sharing ... Fix #668	2016-11-09 18:18:49 +01:00
Jeremy Benoist	8d7b4f0eff	Display a bigger image in case of image content ... If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig	2016-11-08 22:17:46 +01:00
Jeremy Benoist	7005b425e0	Remove the left margin of tag ... In the entries list, the first tag below the link isn’t stick to the left. Now it is.	2016-11-08 22:15:37 +01:00
Jeremy Benoist	41c2178685	Merge pull request #2548 from wallabag/pinboard ... Add Pinboard import	2016-11-08 14:19:40 +01:00
Nicolas Lœuillet	db3838545c	Removed Maintenance bundle	2016-11-06 15:34:08 +01:00
Jeremy Benoist	9ab024b4f5	Add Pinboard import	2016-11-04 22:44:31 +01:00
Nicolas Lœuillet	a3f7d8a870	Prepare wallabag 2.1.3 🚀	2016-11-04 09:10:15 +01:00
Nicolas Lœuillet	2db9142bfc	Merge pull request #2460 from wallabag/ui-changes ... UI Changes	2016-11-04 08:49:52 +01:00
Jeremy Benoist	1e7b04d4ea	Use created_at as default sort ... With index (following https://github.com/wallabag/wallabag/pull/2534)	2016-11-04 07:56:04 +01:00
Jeremy Benoist	5a619812ca	Merge remote-tracking branch 'origin/master' into 2.2	2016-11-03 16:41:29 +01:00
Jeremy Benoist	da41365579	Merge pull request #2180 from wallabag/download-pictures ... Download pictures	2016-11-03 16:22:07 +01:00
Thomas Citharel	32508ef07a	avoid eslint warning by disabling line ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-03 14:23:09 +01:00
Thomas Citharel	d56d416d9b	Deal with more resolution issues ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-03 12:49:57 +01:00
Thomas Citharel	3221b2e413	Fix resolution issues and 'title' issues ... Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-11-03 11:28:40 +01:00
Jeremy Benoist	3be554c78f	Merge pull request #2519 from Jibec/master ... Translation update - French	2016-11-02 07:48:10 +01:00
Nicolas Lœuillet	3b81212674	Added translations and baggy part	2016-10-31 16:48:34 +01:00
Nicolas Lœuillet	e61ee56031	Added QRCode and link to configure android application	2016-10-31 16:18:52 +01:00
Jeremy Benoist	aedd6ca0fd	Add translations & migration	2016-10-31 13:29:33 +01:00
Jean-Baptiste	a0eddc598e	Translation update - French	2016-10-30 12:09:08 +01:00
Jeremy Benoist	535bfcbe80	Move related event things in Event folder	2016-10-30 09:58:39 +01:00
Nicolas Lœuillet	c4b3933bae	Updated Capistrano configuration	2016-10-29 14:39:07 +02:00
Nicolas Lœuillet	f08ec5f88a	Remove backquote in query	2016-10-28 11:14:14 +02:00