2476 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nicolas Lœuillet	edf3e88d88	Merge pull request #1977 from wallabag/es-translation ... Es translation	2016-04-25 14:12:50 +02:00
Jeremy Benoist	10cc2785a0	Fix indentations in ES translation	2016-04-24 20:53:11 +02:00
jami7	acc371a129	Update messages.es.yml	2016-04-24 20:48:16 +02:00
jami7	ef37b9af71	Update messages.es.yml	2016-04-24 20:48:16 +02:00
Nicolas Lœuillet	d6a9e139dc	Fix tests	2016-04-24 20:46:25 +02:00
Nicolas Lœuillet	d8f8a59010	Fix wrong reading time when apply filters	2016-04-24 20:24:23 +02:00
Thomas Citharel	f97653c895	Merge pull request #1970 from wallabag/typo-api-doc ... Fix typos in API documentation	2016-04-23 14:57:06 +02:00
Nicolas Lœuillet	58f0d0bdeb	Fix typos in API documentation	2016-04-23 14:12:55 +02:00
Thomas Citharel	3cfbe3c7e8	Merge pull request #1969 from wallabag/doc-3rd-resources-api ... Create 3rd Resources chapter in API documentation	2016-04-23 13:53:05 +02:00
Nicolas Lœuillet	8c2affe680	Create 3rd Resources chapter in API documentation	2016-04-23 13:21:08 +02:00
Thomas Citharel	c9bdd9a83f	Merge pull request #1967 from wallabag/add-faq-documentation ... Add FAQ page in documentation	2016-04-23 10:57:25 +02:00
Nicolas Lœuillet	0e9339c46c	Add FAQ page in documentation	2016-04-23 10:36:25 +02:00
Nicolas Lœuillet	9c0bc04cfe	Merge pull request #1965 from wallabag/prepare-203 ... Prepare release 2.0.3	2016-04-22 18:40:48 +02:00
Nicolas Lœuillet	dafde7fb2f	Prepare release 2.0.3	2016-04-22 18:08:16 +02:00
Nicolas Lœuillet	9481187896	Merge pull request #1962 from wallabag/update-api-documentation ... Update API documentation with cURL examples	2016-04-22 08:38:04 +02:00
Nicolas Lœuillet	1c90663b79	Update API documentation with cURL examples	2016-04-21 18:48:17 +02:00
Nicolas Lœuillet	7d5b4631d0	Merge pull request #1948 from wallabag/prepare-202 ... Prepare release 2.0.2	2016-04-21 09:44:44 +02:00
Nicolas Lœuillet	9f151b469f	Update changelog	2016-04-21 08:42:41 +02:00
Nicolas Lœuillet	45919a295e	Merge pull request #1957 from wallabag/fix-gotoaccount-button-translation ... Fix translation for Go to your account button after subscription	2016-04-21 08:37:36 +02:00
Nicolas Lœuillet	2499cdbf29	Fix translation for Go to your account button after subscription ... Fix #1956	2016-04-20 15:53:20 +02:00
Nicolas Lœuillet	868e76af10	Merge pull request #1945 from ddeimeke/master ... Added some curl examples	2016-04-20 10:10:46 +02:00
Thomas Citharel	f88530de68	Merge pull request #1954 from wallabag/update-links-doc ... Update links in documentation	2016-04-19 20:25:36 +02:00
Nicolas Lœuillet	4a25bef077	Update links in documentation	2016-04-19 20:03:34 +02:00
Nicolas Lœuillet	24f65a838c	Merge pull request #1953 from maxi62330/master ... Actualisation des liens morts (Documentation de traduction)	2016-04-19 19:54:44 +02:00
Martinet Maxime	89bafa95ed	Actualisation des liens morts (Documentation de traduction)	2016-04-19 19:25:04 +02:00
Nicolas Lœuillet	18bb5a90d5	Prepare release 2.0.2	2016-04-19 10:01:29 +02:00
Dirk Deimeke	938a16c0f6	Added some curl examples	2016-04-19 08:00:07 +02:00
Thomas Citharel	ca8d61b958	Merge pull request #1942 from wallabag/optimize-import ... Optimize import	2016-04-18 22:13:48 +02:00
Thomas Citharel	23feba63bb	Merge pull request #1944 from wallabag/travis-rename-branches ... Update Travis configuration with branches renaming	2016-04-18 22:12:52 +02:00
Nicolas Lœuillet	3320d39418	Update Travis configuration with branches renaming	2016-04-18 21:46:36 +02:00
Nicolas Lœuillet	23d24b1750	Add tests	2016-04-18 15:29:57 +02:00
Nicolas Lœuillet	dc12084d93	Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live	2016-04-18 14:48:18 +02:00
Thomas Citharel	0907a72c64	Merge pull request #1938 from wallabag/hide-pagination ... Display pagination only if we have more than one page	2016-04-18 09:41:56 +02:00
Nicolas Lœuillet	188b74b6df	Display pagination only if we have more than one page	2016-04-18 09:03:21 +02:00
Nicolas Lœuillet	71601c171f	Merge pull request #1935 from jami7/patch-8 ... Update messages.es.yml	2016-04-17 08:03:36 +02:00
jami7	5c2c1a6434	Update messages.es.yml	2016-04-16 14:04:39 -10:00
Nicolas Lœuillet	7fdecbb73c	Merge pull request #1933 from wallabag/hide-pagination ... Hide pagination if we only have one entry to display	2016-04-16 08:36:24 +02:00
Nicolas Lœuillet	1f034a3316	Hide pagination if we only have one entry to display	2016-04-16 07:19:30 +02:00
Nicolas Lœuillet	d1f4996b77	Merge pull request #1925 from wallabag/fix-redirect-without-referer ... Redirect to homepage if referer is null	2016-04-15 17:52:33 +02:00
Nicolas Lœuillet	5180302650	Merge pull request #1929 from wallabag/change-guid-rss ... Change guid and link in RSS feeds to give original entry URL	2016-04-15 17:51:56 +02:00
Nicolas Lœuillet	2d899e8d30	Change guid and link in RSS feeds to give original entry URL ... Fix #1926	2016-04-15 16:07:34 +02:00
Nicolas Lœuillet	345d74268b	Fix redirect when delete entry	2016-04-15 15:39:00 +02:00
Nicolas Lœuillet	4086e0782e	Fix tests	2016-04-15 09:58:29 +02:00
Nicolas Lœuillet	af497a641c	Redirect to homepage if referer is null ... Fix #1924	2016-04-15 07:58:01 +02:00
Nicolas Lœuillet	f2e5fdc366	Merge pull request #1916 from wallabag/cleanup ... Convert array + phpDoc	2016-04-13 09:43:14 +02:00
Jeremy Benoist	a417b86923	Merge pull request #1918 from wallabag/improve-pagination ... Improve pagination when user has lot of entries	2016-04-13 09:42:18 +02:00
Nicolas Lœuillet	18078ded12	Fix indentation	2016-04-13 09:20:01 +02:00
Jeremy Benoist	245e2e2cae	Merge pull request #1919 from wallabag/cleanup-composerjson ... Remove useless dependancy	2016-04-12 22:20:05 +02:00
Jeremy Benoist	86732aa01c	Move test parameters out of parameters.yml ... The end user doesn't care to about the test database.	2016-04-12 22:14:22 +02:00
Nicolas Lœuillet	c31ea8a409	Remove useless dependancy	2016-04-12 21:47:16 +02:00