3218 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Benoist	309e13c11b	Move settings before Entry ... Because we need wallabag_url to be defined when we’ll insert entries	2016-10-30 20:12:34 +01:00
Jeremy Benoist	41ada277f0	Add instance url to the downloaded images	2016-10-30 19:50:00 +01:00
Thomas Citharel	f74061f1e1	Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl ... docs: fix link to wallabag-stats project	2016-10-30 12:27:25 +01:00
Jean-Baptiste	2087e499b4	Translation update - French	2016-10-30 12:11:24 +01:00
Jean-Baptiste	f6aff9a7a8	Translation update - French	2016-10-30 12:10:59 +01:00
Jean-Baptiste	431d038aa7	Translation update - French	2016-10-30 12:10:14 +01:00
Jean-Baptiste	a0eddc598e	Translation update - French	2016-10-30 12:09:08 +01:00
Sven Fischer	90ec78f05a	docs: fix link to wallabag-stats project	2016-10-30 12:01:24 +01:00
Jeremy Benoist	48656e0eaa	Fixing tests	2016-10-30 11:27:09 +01:00
Jeremy Benoist	7f55941856	Use doctrine event to download images	2016-10-30 10:48:29 +01:00
Jeremy Benoist	45fd7e09d7	Cleanup	2016-10-30 09:58:53 +01:00
Jeremy Benoist	535bfcbe80	Move related event things in Event folder	2016-10-30 09:58:39 +01:00
Nicolas Lœuillet	2a2ceceaa4	Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl ... docs: update 3rd party projects by Strubbl	2016-10-30 07:04:11 +01:00
Sven Fischer	a40b2b7ee4	docs: update 3rd party projects by Strubbl	2016-10-29 19:59:05 +02:00
Jeremy Benoist	156bf62758	CS	2016-10-29 16:25:45 +02:00
Thomas Citharel	94654765cc	Working	2016-10-29 16:25:45 +02:00
Thomas Citharel	419214d722	Download pictures successfully ... Needs to rewrite them properly (get base url)	2016-10-29 16:25:45 +02:00
Thomas Citharel	4dface6670	first draft (from v1)	2016-10-29 16:25:45 +02:00
Jeremy Benoist	ca9858537e	Merge pull request #2513 from wallabag/update-capistrano-config ... Updated Capistrano configuration	2016-10-29 15:36:58 +02:00
Nicolas Lœuillet	c4b3933bae	Updated Capistrano configuration	2016-10-29 14:39:07 +02:00
Nicolas Lœuillet	67b270d996	Merge pull request #2506 from wallabag/fix-export-with-tags ... Fixed entries export filtered with a tag	2016-10-29 14:27:46 +02:00
Nicolas Lœuillet	794ac861cb	Added test for export by filtering with tag	2016-10-29 14:03:55 +02:00
Nicolas Lœuillet	920d88599a	Fixed entries export filtered with a tag ... Fix #2505	2016-10-29 13:43:11 +02:00
Jeremy Benoist	5feef9f7a4	Merge pull request #2499 from wallabag/add-relation-client-user ... Added relation between API Client and User	2016-10-29 13:20:55 +02:00
Jeremy Benoist	267087d969	Merge pull request #2509 from wallabag/explode-api-controller ... Exploded WallabagRestController into many controllers	2016-10-29 13:20:01 +02:00
Nicolas Lœuillet	bc4564a709	Removed useless route	2016-10-28 15:24:58 +02:00
Nicolas Lœuillet	900c844861	Exploded WallabagRestController into many controllers ... Fix #2503	2016-10-28 14:46:30 +02:00
Nicolas Lœuillet	f08ec5f88a	Remove backquote in query	2016-10-28 11:14:14 +02:00
Nicolas Lœuillet	f24ea59ea4	Fixed migration and added tests	2016-10-28 10:55:39 +02:00
Nicolas Lœuillet	eca4d030bf	Merge pull request #2508 from wallabag/fix-redis-rabbit-doc ... Added the whole path to parameters.yml file	2016-10-27 16:53:57 +02:00
Nicolas Lœuillet	37da178696	Added the whole path to parameters.yml file	2016-10-27 14:46:21 +02:00
Nicolas Lœuillet	069d39dfaf	Merge pull request #2507 from wallabag/add-check-makefile ... Added require.sh to check if composer is installed	2016-10-27 13:55:17 +02:00
Nicolas Lœuillet	c4d9a8d6d0	Usage of composer.phar if it's found	2016-10-27 10:09:43 +02:00
Nicolas Lœuillet	9998c72533	Added require.sh to check if composer is installed	2016-10-27 09:53:09 +02:00
Jeremy Benoist	f3b637fbfe	Merge pull request #2500 from wallabag/add-check-composer ... Added a check in Makefile to see if composer is installed	2016-10-27 07:30:50 +02:00
Nicolas Lœuillet	a5d6a7d8b5	Merge pull request #2504 from wallabag/change-page-title-filter-tags ... Added tag label in the page title	2016-10-26 16:09:37 +02:00
Nicolas Lœuillet	73e8df9e44	Renamed variable for page title	2016-10-26 15:49:44 +02:00
Nicolas Lœuillet	7a5043f187	Added tag label in the page title ... Fix #2472	2016-10-26 13:53:23 +02:00
Jeremy Benoist	c68720d40e	Merge pull request #2473 from pmichelazzo/master ... Portuguese (Brazilian) translation	2016-10-25 11:41:24 +02:00
Paulino Michelazzo	e8eec07ae6	Translated missed line 147	2016-10-25 07:25:08 -02:00
Nicolas Lœuillet	c5ad143e75	Added a check in Makefile to see if composer is installed ... Fix #2498	2016-10-24 22:28:44 +02:00
Nicolas Lœuillet	23406ca3f1	Added relation between API Client and User ... Fix #2062	2016-10-24 21:56:28 +02:00
Nicolas Lœuillet	e1d4ed2d81	Merge pull request #2493 from bmillemathias/add_link_content_fetch_problem ... Add relevant links to fetch content error page	2016-10-24 21:44:22 +02:00
Nicolas Lœuillet	d36e5e20a5	Removed the email part	2016-10-24 21:01:13 +02:00
Nicolas Lœuillet	8e58be9fb6	Merge pull request #2496 from wallabag/mruminski-patch-1 ... Update messages.pl.yml	2016-10-24 20:19:53 +02:00
Mateusz Rumiński	cd99bfae68	Update messages.pl.yml ... translate reset section to polish	2016-10-24 19:49:33 +02:00
Jeremy Benoist	64a8781e45	Merge remote-tracking branch 'origin/master' into 2.2	2016-10-24 12:03:17 +02:00
Jeremy Benoist	9313ea9d44	Merge pull request #2401 from wallabag/reset-account ... Reset account	2016-10-24 11:57:51 +02:00
Jeremy Benoist	f623516e10	SQLite should use utf8, not utf8mb4	2016-10-24 10:10:38 +02:00
Nicolas Lœuillet	a1c1841828	Merge pull request #1890 from wallabag/v2-api-annotation-switched ... bring annotations to API	2016-10-24 10:06:12 +02:00