1771 commits

Author	SHA1	Message	Date
Nicolas Lœuillet	df30af69d2	Added new tag form in mobile view for Material theme ... Fix #2376	2016-11-08 14:24:00 +01:00
Nicolas Lœuillet	a4de2351a0	Merge pull request #2556 from wallabag/replace-tokenstorage ... Replaced TokenStorage with TokenStorageInterface	2016-11-07 11:13:50 +01:00
Nicolas Lœuillet	94766a8962	PHP CS	2016-11-07 10:41:11 +01:00
Nicolas Lœuillet	2fe2e411a7	Replaced TokenStorage with TokenStorageInterface	2016-11-07 10:34:49 +01:00
Strubbl	56e6216485	Update messages.en.yml ... Instapaper->Pinboard	2016-11-06 22:29:49 +01:00
Strubbl	e8e72daaa6	Update messages.de.yml	2016-11-06 22:29:08 +01:00
Jeremy Benoist	d61b24e459	Round readingtime to avoid crazy number ... Like `8.666666666667 min`	2016-11-06 21:41:32 +01:00
Jeremy Benoist	9ab024b4f5	Add Pinboard import	2016-11-04 22:44:31 +01:00
Jeremy Benoist	b5571b52cc	Merge pull request #2541 from wallabag/mruminski-patch-1 ... Update messages.pl.yml	2016-11-04 21:49:42 +01:00
Mateusz Rumiński	ff7f551f5a	Update messages.pl.yml ... missing polish translation added	2016-11-04 19:26:06 +01:00
Quent-in	eaa0bf00a6	Update of the OC version	2016-11-04 18:13:11 +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	7e9c1d65b1	Add index into Table definition	2016-11-04 08:02:02 +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	ce11952447	Use created_at as default sort ... Imported content use the real creation date. If we sort by id, it'll display contents in reverse order.	2016-11-04 07:34:38 +01:00
Jeremy Benoist	001cc7168a	Cleanup	2016-11-03 18:01:25 +01:00
Jeremy Benoist	864c1dd23a	Fix rest controller merge	2016-11-03 17:29:16 +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
Jeremy Benoist	ca08d02f2f	Add warning message for import + download images ... When import isn't async and downloading images is enabled, we warn the user that import can fail. Also, added missing translations	2016-11-03 15:59:20 +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
Jeremy Benoist	e46fdf3096	CS	2016-11-02 07:26:14 +01:00
Jeremy Benoist	9c15470691	wallabag is full lowercase	2016-11-02 07:15:24 +01:00
Jeremy Benoist	1f66d79e6b	Add more importer to wallabag:import command ... All importer available expect Pocket which require an oAuth login.	2016-11-02 07:10:57 +01:00
Jeremy Benoist	7816eb622d	Add entry.saved event to import & rest	2016-11-02 07:10:23 +01:00
Kevin Decherf	22ef6f96e2	Force user-agent for .slashdot.org ... Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2016-11-01 19:51:45 +01:00
Jeremy Benoist	e0597476d1	Use custom event instead of Doctrine ones ... This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.	2016-11-01 14:49:02 +01:00
Laurent	995d909d0f	Add Instapaper to CLI import	2016-11-01 18:33:32 +08:00
Jean-Baptiste	303b3c61a7	Translation - French - tiny typo	2016-10-31 20:16:36 +01:00
Jean-Baptiste	31dd328df4	Translation - French - tiny escape correction	2016-10-31 20:12:29 +01:00
Jean-Baptiste	337b47c216	Translation - French - tiny escape correction	2016-10-31 20:01:07 +01:00
Nicolas Lœuillet	68e0efffb8	Fixed review	2016-10-31 17:20:27 +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
Jeremy Benoist	d1495dd0a4	Ability to enable/disable downloading images ... This will speed up the test suite because it won’t download everything when we add new entry… Add a custom test with downloading image enabled	2016-10-30 21:30:45 +01:00
Jeremy Benoist	4b3c983ab8	Inject parameter instead of service ... We are injecting CraueConfig service when we only need to retrieve one or two values from it. Instead I discovered we can directly inject a value from a service in the service definition!	2016-10-30 20:27:41 +01:00
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
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
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
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
Nicolas Lœuillet	920d88599a	Fixed entries export filtered with a tag ... Fix #2505	2016-10-29 13:43:11 +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	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	23406ca3f1	Added relation between API Client and User ... Fix #2062	2016-10-24 21:56:28 +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	5ce1528953	Fix migrations	2016-10-23 12:35:57 +02:00
Jeremy Benoist	88d5d94dcb	Lowercase wallabag	2016-10-22 14:05:59 +02:00
Jeremy Benoist	fc79f1ffa8	Add verification check for MySQL version ... Must now be >= 5.5.4	2016-10-22 13:41:03 +02:00
Jeremy Benoist	b0de88f75d	Use statements & update translation	2016-10-22 13:13:07 +02:00
Jeremy Benoist	8c61fd12b1	CS	2016-10-22 13:13:07 +02:00
Jeremy Benoist	ca8b49f46e	Add baggy reset part	2016-10-22 13:13:07 +02:00
Jeremy Benoist	f71e55ac88	Avoid orphan tags	2016-10-22 13:13:07 +02:00
Jeremy Benoist	2f82e7f8e1	Cleanup subscriber / listener definition	2016-10-22 13:13:07 +02:00
Jeremy Benoist	191564b7f7	Add custom doctrine subscriber for SQLite ... Since SQLite doesn’t handle cascade remove by default, we need to handle it manually. Also some refacto	2016-10-22 13:13:07 +02:00
Jeremy Benoist	98efffc2a6	Fix emoji insertion in MySQL ... Switch to utf8mb4 instead of utf8 because f*** MySQL See https://github.com/doctrine/dbal/pull/851	2016-10-22 13:13:07 +02:00
Jeremy Benoist	206bade58a	Add ability to reset some datas ... - annotations - tags - entries	2016-10-22 13:13:06 +02:00
Jeremy Benoist	817724a7b8	Re-add bottom pagination ... Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template	2016-10-22 13:09:16 +02:00
Thomas Citharel	34aa06a9b9	WIP ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-10-22 13:08:04 +02:00
Jeremy Benoist	aa4741091f	Add test on /api/annotations ... Fix controller forward in WallabagRestController. Update PHPDoc so it is sorted the same way as others one Duplicate all annotations test to use both api & normal way Also, make annotation tests independent to each other	2016-10-22 12:09:20 +02:00
Jeremy Benoist	3199ec4702	CS	2016-10-22 09:17:01 +02:00
Nicolas Lœuillet	d9b7768dca	Added a missing namespace	2016-10-22 09:06:07 +02:00
Thomas Citharel	0c271b9eb0	fix cs and phpdoc	2016-10-22 09:06:07 +02:00
Thomas Citharel	b1e92f8c14	cs	2016-10-22 09:06:07 +02:00
Thomas Citharel	1eea248bb0	move code	2016-10-22 09:06:07 +02:00
Thomas Citharel	c7935f32d2	cs	2016-10-22 09:06:07 +02:00
Thomas Citharel	351eb8d97e	bring annotations to API	2016-10-22 09:06:07 +02:00
Nicolas Lœuillet	f99ddbc6f8	Merge pull request #2481 from wallabag/some-fixes ... Some fixes	2016-10-21 15:15:41 +02:00
Jeremy Benoist	b64d8f2c9f	Update Twitter cards description	2016-10-21 10:51:20 +02:00
Jeremy Benoist	2cbf0d05d4	Update translation for piwik_host	2016-10-21 10:45:39 +02:00
Jeremy Benoist	645dc7594b	Fix missing translations	2016-10-21 07:52:55 +02:00
Jeremy Benoist	818cbe1fee	Fix Portuguese translation	2016-10-21 07:18:41 +02:00
Paulino Michelazzo	8e53bf3aa1	Update translation	2016-10-21 00:12:53 +02:00
Jeremy Benoist	2297d60f10	If reload content failed, don’t update it ... In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.	2016-10-20 22:49:46 +02:00
Jeremy Benoist	5453500458	Requeue depending on producer ... Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)	2016-10-20 21:17:45 +02:00
Jeremy Benoist	1e3d74a9cf	Avoid RabbitMQ consumer to loop ... When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.	2016-10-20 21:17:03 +02:00
Jeremy Benoist	576d285ddf	Translate date ... I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..	2016-10-20 21:16:01 +02:00
Jeremy Benoist	166e8cc6a9	Fix french translation	2016-10-20 21:14:46 +02:00
Jeremy Benoist	1cad9416c9	Update Portuguese translations	2016-10-20 21:11:10 +02:00
Paulino Michelazzo	a42cc6ff89	Update validators.pt.yml file ... Some missed strings translated.	2016-10-20 08:57:24 +02:00
Paulino Michelazzo	99731f0bb1	Merge remote-tracking branch 'wallabag/master'	2016-10-18 22:48:23 +02:00
Paulino Michelazzo	3a3c6b866b	Portuguese (Brazilian) translation ... This the Portuguese (Brazilian) for the Wallaby v2.	2016-10-18 20:51:31 +02:00
Jeremy Benoist	692f9388cb	Merge pull request #2455 from wallabag/fix-material-config-tabs ... Fix tabs on material	2016-10-16 21:06:23 +02:00
Jeremy Benoist	3fb409ffc6	Merge pull request #2454 from wallabag/fix-baggy-small-width ... Fix baggy display on small screens	2016-10-16 21:05:30 +02:00
Thomas Citharel	97512ec4bc	Merge pull request #2459 from wallabag/improve-german-translation ... German: improve existing and add missing translation	2016-10-16 12:06:42 +02:00
Sven Fischer	5bd7acd50d	German: improve existing and add missing translation	2016-10-16 10:45:51 +02:00
Sven Fischer	f69ab83a5a	add link to German documentation in about page	2016-10-16 09:23:58 +02:00
Thomas Citharel	d9a30ef301	Fix tabs on material ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2016-10-15 19:26:38 +02:00
Thomas Citharel	d32e1c424a	Fix baggy on small screens	2016-10-15 19:04:53 +02:00
Jeremy Benoist	5960aa1ffc	CS	2016-10-15 18:00:08 +02:00
Jeremy Benoist	f1c3f68e90	ApiDoc & Route annotation were conflicted ... The generated error was “Unable to guess how to get a Doctrine instance from the request information.”. I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter). Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place). I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get a 406 error from FosRest. Should be ok now …	2016-10-15 16:46:42 +02:00
Alexandr Danilov	38dc91be8e	Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens	2016-10-15 14:49:07 +02:00
Mateusz Rumiński	fa100dd1e0	Update messages.pl.yml ... translate delete section to polish	2016-10-12 19:32:30 +02:00
Jeremy Benoist	b1b561da51	Merge pull request #2372 from pmartin/api-get-entry-as-epub ... API: ability to export entry in all available format (epub, pdf, etc...)	2016-10-12 14:06:33 +02:00
Jeremy Benoist	e4cf672ccf	Merge remote-tracking branch 'origin/master' into 2.2	2016-10-11 21:01:30 +02:00
Jeremy Benoist	e57df5611f	Merge pull request #2409 from wallabag/Quent-in-patch-1 ... Occitan version update	2016-10-11 18:18:29 +02:00
Quent-in	a9e4d6dad2	Update messages.oc.yml ... I thought I had translated the Docker installation line, apparently not! Thanks Nicolas for the other changes!	2016-10-10 20:01:25 +02:00
Nicolas Lœuillet	a2f42d8eaa	Fixed Twitter Cards by adding a description tag	2016-10-10 16:05:06 +02:00
Nicolas Lœuillet	020c723e28	Added support of Twitter Cards for public articles	2016-10-10 14:33:34 +02:00
Nicolas Lœuillet	c26d1285ba	Fixed review	2016-10-10 10:05:50 +02:00
Nicolas Lœuillet	2a5ff7f554	Merge pull request #2411 from wallabag/fix-entities ... Fix entities definition	2016-10-10 08:02:25 +02:00
Jeremy Benoist	8eeefc658c	Merge pull request #2414 from szafranek/bugfix-bookmarklet ... Remove automatic closing of the window from bookmarklet	2016-10-10 07:11:01 +02:00
Krzysztof Szafranek	d8a9209cfc	Remove automatic closing of the window from bookmarklet	2016-10-09 22:40:55 +02:00
Jeremy Benoist	39a19bdf47	When a sub command fail, display error message ... We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”. Using the `BufferedOutput` we can store the output and only display it if an error occurs.	2016-10-09 22:39:43 +02:00
Jeremy Benoist	8dc4cd0f25	Fix entities definition ... As per Doctrine said in the debug tool bar: - The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute. - The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.	2016-10-09 20:51:37 +02:00
Jeremy Benoist	28bb48905a	Optimize the way tag list is rendered ... Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query. Also change the layout of the tag list in material design	2016-10-09 18:55:22 +02:00
Jeremy Benoist	b4fcd60e7f	Avoid tag duplication when tagging all articles ... Mostly when the tag doesn’t yet exist. It was created each time it matche the rule… glups.	2016-10-09 18:55:21 +02:00
Jeremy Benoist	4d318f3755	Add more log to tag:all	2016-10-09 18:55:21 +02:00
Quent-in	dd248e4561	Occitan version update ... If you need to write dates in full letter you might be interessed in https://github.com/fightbulc/moment.php It comes with lots of languages ;) Q: where are the "previous" and "next" bouton text? Can't find them to translate them.	2016-10-09 18:24:42 +02:00
Jeremy Benoist	e39aec3e38	Merge pull request #2406 from szafranek/bugfix-number-of-annotations ... Show number of annotations instead of nbAnnotations placeholder	2016-10-09 14:11:20 +02:00
Krzysztof Szafranek	90c766b96b	Show number of annotations instead of nbAnnotations placeholder ... When there was more than one annotation, a placeholder was displayed in both themes, instead of actual number.	2016-10-09 04:59:04 +02:00
Krzysztof Szafranek	c5e4293efd	Fix few invalid HTML tags	2016-10-09 03:37:21 +02:00
Jeremy Benoist	9810f30821	Remove unnecessary user serialization	2016-10-08 21:16:40 +02:00
Jeremy Benoist	7ac3e575f1	CS	2016-10-08 20:35:16 +02:00
Jeremy Benoist	a730cae384	Bonus: display driver in install command	2016-10-08 20:33:21 +02:00
Jeremy Benoist	3f60446756	Fix PostgreSQL query ... PostgreSQL doesn’t like when we compare interger and boolean :)	2016-10-08 20:26:06 +02:00
Jeremy Benoist	876d77a67d	Better display and description ... Confirmation message isn’t required since it is written in the delete description	2016-10-08 20:25:42 +02:00
Jeremy Benoist	eed812afd0	Logout user before deleting it ... And add a smal description	2016-10-08 19:39:12 +02:00
Nicolas Lœuillet	93a95c09bf	Merge pull request #2351 from wallabag/fix-api-client-deletion ... Changed relation between API client and refresh token	2016-10-08 13:31:54 +02:00
Nicolas Lœuillet	4ad6f5878a	Merge pull request #2393 from wallabag/api-urls-exist ... Ability to check multiple urls in API	2016-10-08 13:31:31 +02:00
Nicolas Lœuillet	71254701b7	Changed tests	2016-10-08 13:27:18 +02:00
Nicolas Lœuillet	bb0c78f4a6	Added check if there is only one user ... Added translations and documentation	2016-10-08 13:27:18 +02:00
Thomas Citharel	abb5291cd5	CS	2016-10-08 13:27:17 +02:00
Thomas Citharel	e4b46f77ef	work	2016-10-08 13:27:17 +02:00
Jeremy Benoist	3f3a60879e	Add entry export in API ... Export isn't available for json & xml because user can use the default entry endpoint instead.	2016-10-08 12:59:19 +02:00
Pascal MARTIN	24de866534	API: getEntry can return EPUB	2016-10-08 12:05:41 +02:00
Pascal MARTIN	3d4b0b3064	Routing: epub format is allowed for API	2016-10-08 12:05:40 +02:00
Jeremy Benoist	ee32248f43	Ensure access_token are removed ... When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)	2016-10-08 00:05:41 +02:00
Jeremy Benoist	ac8cf632bb	Ensure orphan tag are remove in API ... When the association between a tag and an entry is removed, if the tag doesn’t have other entries, we can remove it. Also add more tests for that part and ensure TagControllerTest is isolated from the rest of the test suite (finally!)	2016-10-07 23:31:53 +02:00
Nicolas Lœuillet	3049afe190	Merge pull request #2396 from wallabag/mruminski-patch-1 ... Update messages.pl.yml	2016-10-07 22:20:51 +02:00
Mateusz Rumiński	aa8a58b5a0	Update messages.pl.yml ... translated shared_by_wallabag to polish	2016-10-07 21:32:27 +02:00
Jeremy Benoist	6d204f5382	Add ability to use socket ... For Redis & MySQL	2016-10-07 21:00:13 +02:00
Jeremy Benoist	f0abc22d09	Ability to check multiple urls in API	2016-10-07 20:37:01 +02:00
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	d5c45d5288	Added default picture if preview picture is null	2016-10-07 15:21:31 +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	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	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
Thomas Citharel	5d39243068	Fix exists API call ... Boo	2016-10-05 15:28:36 +02:00
Thomas Citharel	15f1352ef8	better tags on material	2016-10-05 14:06:55 +02:00
Thomas Citharel	645c0d5bce	better tags on baggy	2016-10-04 20:11:10 +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	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
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
Thomas Citharel	a494c33ef7	Basically, fix everything ... * Remove install.sh * Assets are now provided * Icons font issues are fixed	2016-10-03 23:08:26 +02:00
Nicolas Lœuillet	b0da721a52	Changed relation between API client and refresh token ... Fix #2350	2016-10-03 21:39:01 +02:00
Thomas Citharel	aafb3321b7	Merge pull request #2341 from mruminski/master ... Update messages.pl.yml	2016-10-03 16:44:19 +02:00
Sven Fischer	1c634fe437	improve German translation	2016-10-03 15:52:27 +02:00
Mateusz Rumiński	0113e2af1f	Update messages.pl.yml ... add missing and update existing translation	2016-10-03 15:05:21 +02:00
Nicolas Lœuillet	0f70abd695	Fixed CSS for quickstart links	2016-10-03 10:27:01 +02:00
Jeremy Benoist	7d002c333d	Merge pull request #2333 from wallabag/translation-german-for-2.1 ... for 2.1, translate all strings to German, which haven't been translated yet	2016-10-03 09:25:51 +02:00
Nicolas Lœuillet	ab809de184	Merge pull request #2314 from wallabag/assets ... Assets work	2016-10-03 09:09:45 +02:00
Jeremy Benoist	c30af946e7	Update messages.de.yml	2016-10-03 09:08:42 +02:00
Nicolas Lœuillet	553f863c3c	Fixed typos	2016-10-03 09:05:40 +02:00
Julian Oster	beee26f6d5	Better translation for the weird sentence	2016-10-02 22:50:27 +02:00
Julian Oster	a878581410	Improve the german translation a bit ... Just some little mistakes, good work so far :)	2016-10-02 22:32:23 +02:00
Sven Fischer	df9c080f8c	translate all strings to German, which haven't been translated yet	2016-10-02 21:41:21 +02:00
Thomas Citharel	dfbbf0e18a	Merge pull request #2331 from wallabag/api-links ... Fix parameters in API _links	2016-10-02 17:48:16 +02:00
Jeremy Benoist	77557d289b	Merge remote-tracking branch 'origin/master' into 2.1	2016-10-02 17:37:41 +02:00
Jeremy Benoist	c3f8b428dd	Fix parameters in API _links ... We forgot to pass them to the factory	2016-10-02 15:41:08 +02:00
Jeremy Benoist	1dc3bee6b9	Merge pull request #2327 from wallabag/user-management ... Add users management UI	2016-10-02 15:00:02 +02:00
Jeremy Benoist	ccc7faec09	Disabled delete button for the logged user ... To avoid some bad things to happen…	2016-10-02 13:29:57 +02:00
Nicolas Lœuillet	18b8dc0e99	Merge pull request #2325 from wallabag/api-entries-exists ... Add an exists endpoint in API	2016-10-02 13:17:23 +02:00
Paulino Michelazzo	ffcd91ec6c	Remove error message when creating ePub versions ... Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML).	2016-10-02 13:16:12 +02:00
Nicolas Lœuillet	92395680b6	Merge pull request #2328 from wallabag/avoid-duplicate-url ... Avoid duplicate url with accents	2016-10-02 13:14:16 +02:00
Jeremy Benoist	03141f9b95	Cleanup & add link on baggy menu	2016-10-02 11:08:53 +02:00
Jeremy Benoist	152fcccd44	Add users management UI ... - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation)	2016-10-02 11:08:53 +02:00
Jeremy Benoist	52c1fc7449	Merge pull request #2326 from wallabag/update-quickstart ... Changed quickstart layout	2016-10-02 11:06:03 +02:00
Jeremy Benoist	6e5e27ab07	Merge pull request #2324 from wallabag/edit-tagging-rule ... Add ability to edit a tagging rule	2016-10-02 11:05:10 +02:00
Jeremy Benoist	bfb3ae01da	Merge pull request #2323 from wallabag/footer-stats ... Add simple stats in footer	2016-10-02 11:04:49 +02:00
Jeremy Benoist	a4df48916d	Fix OC typos ... + remove extra sentence	2016-10-02 09:57:48 +02:00
Jeremy Benoist	3583cadf6f	CS	2016-10-02 01:43:50 +02:00
Quent-in	1bcfeb0f4a	Occitan version update ... to be ready for the future of Wallabag :)	2016-10-01 18:23:37 +02:00
Nicolas Lœuillet	0d61b6015f	Fixed french translation	2016-10-01 18:15:59 +02:00
Jeremy Benoist	2455472e26	CS	2016-10-01 18:05:25 +02:00
Jeremy Benoist	19ca0b2f35	Avoid duplicate url with accents	2016-10-01 18:00:11 +02:00
Nicolas Lœuillet	7d72cce4c7	Changed translations	2016-10-01 17:29:04 +02:00
Jeremy Benoist	8799bde00d	Introduce validateRuleAction	2016-10-01 17:24:24 +02:00
Jeremy Benoist	6273fefd5d	Add an exists endpoint in API ... It should allow third party to check if an url was already saved by a user	2016-10-01 17:15:28 +02:00
Nicolas Lœuillet	a44d2613c7	Changed quickstart layout	2016-10-01 17:13:53 +02:00
Jeremy Benoist	bf3dc999e7	Add ability to edit a tagging rule	2016-10-01 16:52:05 +02:00
Nicolas Lœuillet	c4bf7af96f	Merge pull request #2322 from wallabag/v2-404 ... Customize errors templates	2016-10-01 16:35:48 +02:00
Jeremy Benoist	1264029cd4	Add simple stats in footer	2016-10-01 16:03:50 +02:00
Jeremy Benoist	40e219622a	Customize errors templates ... All error goes to the same template which only display the error message and the status code.	2016-10-01 14:58:48 +02:00
Jeremy Benoist	fb7354c4a4	Fix bad template name ... When a user register, the template displayed saying it should now check its email was misspelled. Resulting in displaying the default one (with margin issue).	2016-09-30 21:02:44 +02:00
Jeremy Benoist	ca17abce2d	Create user config in one place ... Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel	2016-09-30 21:01:36 +02:00
Nicolas Lœuillet	2ff9991a1d	Removed duplicated templates files	2016-09-30 09:38:08 +02:00
Nicolas Lœuillet	fb479be3a0	Merge pull request #2315 from wallabag/fixes-about-upgrade ... Fixes about upgrade	2016-09-29 11:35:47 +02:00
Mateusz Rumiński	02384d22ef	Update messages.pl.yml ... add missing translation for Instapaper importer	2016-09-29 01:04:06 +02:00
Nicolas Lœuillet	eef8aeec8f	Reordered upgrade documentation	2016-09-28 11:13:20 +02:00
Thomas Citharel	c146f6940a	Assets work ... * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231	2016-09-28 10:30:18 +02:00
Nicolas Lœuillet	084fb0d303	Some fixes about upgrade from 2.0.x -> 2.1.0	2016-09-28 10:04:36 +02:00
Jeremy Benoist	a9e92b6609	Add Instapaper translations	2016-09-27 20:27:08 +02:00
Jeremy Benoist	c7ea9b41f3	Add controller test for Instapaper	2016-09-27 20:27:08 +02:00
Jeremy Benoist	ff1a5362f7	Add Instapaper import ... Also update ImportController with latest import (chrome, firefox & instapaper).	2016-09-27 20:27:08 +02:00
Mateusz Rumiński	20762cd1ab	Update messages.pl.yml ... add missing translation for Firefox and Chrome imports	2016-09-27 00:58:44 +02:00
Jeremy Benoist	d6de23a100	Merge pull request #2192 from wallabag/import-browser-bookmarks ... Import Firefox & Chrome bookmarks into wallabag	2016-09-26 14:47:02 +02:00
Jeremy Benoist	990adfb34c	Move prepareEntry to dedicated place ... Yeah first try was ugly, now each part are in the dedicated place. Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.	2016-09-26 07:30:02 +02:00
Jeremy Benoist	12d93e6896	Update Firefox file ... With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so).	2016-09-25 22:24:07 +02:00
Jeremy Benoist	27acc6ddb8	Fix bad date format in Browser import	2016-09-25 15:32:02 +02:00
Nicolas Lœuillet	bd206a84d8	Fixed tests by removing clear()	2016-09-25 12:29:19 +02:00
Thomas Citharel	64b1229b2d	fix tests	2016-09-25 12:29:19 +02:00
Thomas Citharel	2c61db30b7	cs & fixes	2016-09-25 12:29:19 +02:00
Thomas Citharel	59201088b4	bring chrome and firefox as separate imports	2016-09-25 12:29:18 +02:00
Nicolas Lœuillet	06d13ddfbc	Indentation and renamed fixtures file	2016-09-25 12:28:55 +02:00
Nicolas Lœuillet	efe659ab84	Add Chrome path for Mac OS	2016-09-25 12:28:55 +02:00
Thomas Citharel	ae669126e7	Import Firefox & Chrome bookmarks into wallabag	2016-09-25 12:28:54 +02:00
Jeremy Benoist	289875836a	Fix tag count for PostgreSQL	2016-09-25 12:23:44 +02:00
Jeremy Benoist	82fc3290d4	CS	2016-09-25 12:03:49 +02:00
Jeremy Benoist	401135852c	Use scheduled entity insertions to avoid tag duplicate ... Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.	2016-09-25 12:03:49 +02:00
Jeremy Benoist	faa86e06ba	Fix tags count in menu ... Move enable cache for Tag in the Entity because function `find*` should return result and not a Query	2016-09-25 12:03:49 +02:00
Jeremy Benoist	13a522dfbd	Display a message when async import won’t work ... Mostly if Redis or RabbitMQ isn’t installed / launched. I guess it’ll avoid some issues.	2016-09-24 19:56:15 +02:00
Jeremy Benoist	637aa17e6b	Merge pull request #2301 from wallabag/fix-rss-feeds ... fix feeds not syncing on android app	2016-09-22 07:51:05 +02:00
Thomas Citharel	389d55f86b	fix feeds not syncing on android app	2016-09-21 19:51:19 +02:00
Mateusz Rumiński	a94108f574	Update messages.pl.yml ... add missing translation	2016-09-19 22:53:02 +02:00
Mateusz Rumiński	267b9d62dc	Update wallabag_user.pl.yml ... add missing "	2016-09-19 22:37:03 +02:00
Mateusz Rumiński	a00bed8b59	polish version ... create wallabag_user.pl.yml file	2016-09-19 20:42:55 +02:00
Jeremy Benoist	d7b4b2c72c	Merge remote-tracking branch 'origin/master' into 2.1	2016-09-19 11:23:07 +02:00
Jeremy Benoist	da18a4682f	Merge pull request #1941 from wallabag/v2-asynchronous-jobs ... Use asynchronous jobs for imports	2016-09-19 07:15:40 +02:00
Étienne Gilli	45d94a98f7	Fix issue #2296: epub export with + in the title.	2016-09-18 14:43:54 +02:00
Jeremy Benoist	59b97fae99	Avoid losing entry when fetching fail ... Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.	2016-09-17 07:40:56 +02:00
Jeremy Benoist	fbb319f064	Missing some migrations ... and CS	2016-09-16 22:58:33 +02:00
Jeremy Benoist	ebe0787e09	Moved Pocket token to user config	2016-09-16 22:22:25 +02:00
Jeremy Benoist	4fc998245c	Only display message in queue for admin ... Instead of for EVERYONE	2016-09-16 20:08:07 +02:00
Nicolas Lœuillet	458beef0a9	Fixed label for mark as read link in entry view ... Fix #2286	2016-09-15 15:32:01 +02:00
Jeremy Benoist	c6b68dc1df	Merge pull request #2287 from wallabag/remove-footer ... Remove footer part	2016-09-15 14:21:21 +02:00
Nicolas Lœuillet	e77cde4531	Remove FooterController	2016-09-15 11:11:24 +02:00
Quent-in	15b1917142	Update messages.oc.yml ... L44 : vosautres, general form vosaltres : local and catalan form vosaultres : doesnt exist ^^	2016-09-14 17:54:09 +02:00
Jeremy Benoist	ac87e0db2a	AMPQ -> AMQP	2016-09-14 10:18:02 +02:00
Jeremy Benoist	c80cc01afa	Change flash message for queued articles	2016-09-13 21:09:05 +02:00
Jeremy Benoist	e01a3c98d6	Display how many messages are queue ... - update the docker-composer to add Redis - add migrations	2016-09-13 20:32:52 +02:00
Nicolas Lœuillet	d49c88f15a	Remove footer part	2016-09-13 20:31:06 +02:00
Jeremy Benoist	5d002e9bdf	Update import.worker.enabled translation	2016-09-12 09:07:53 +02:00
Jeremy Benoist	ebf5e5087d	Add tests on ImportCommand	2016-09-11 22:15:31 +02:00
Jeremy Benoist	015c7a8359	Add more tests ... And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)	2016-09-11 22:15:31 +02:00
Jeremy Benoist	7d862f83b9	Re-facto EntryConsumer ... Using an abstract method allow to share code but also can be used it we add a new broker in the future	2016-09-11 22:15:31 +02:00
Jeremy Benoist	dc69e25f97	Display a message when async is enabled	2016-09-11 22:15:28 +02:00
Jeremy Benoist	b3437d58ae	Enable Redis async import ... - using javibravo/simpleue - internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear - if both option are enable rabbit will be choosen - services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml` -	2016-09-11 21:58:56 +02:00
Jeremy Benoist	7f7531171f	Retrieve created date from Pocket	2016-09-11 21:58:56 +02:00
Jeremy Benoist	13470c3596	Add test for RabbitMQ ... Also update Symfony deps	2016-09-11 21:58:56 +02:00
Jeremy Benoist	8664069e1a	Fix DateTime & clear()	2016-09-11 21:58:55 +02:00
Jeremy Benoist	6d65c0a8b0	Add ability to define created_at for all import ... At the moment only Readability & wallabag v2 import allow created_at import. Pocket removed `time_added` field from their API v2 to v3... And wallabag v1 doesn't export that value.	2016-09-11 21:58:55 +02:00
Jeremy Benoist	3aca0a9f00	CS	2016-09-11 21:58:55 +02:00
Jeremy Benoist	3849a9f323	Some cleanup & refactor	2016-09-11 21:58:55 +02:00
Jeremy Benoist	02f6489572	Retrieve all items from Pocket ... 5000 by 5000. Also, retrieve newest item first.	2016-09-11 21:58:31 +02:00
Jeremy Benoist	c98db1b653	Convert other imports to Rabbit	2016-09-11 21:58:31 +02:00
Jeremy Benoist	ef75e1220e	Send every imported item to the queue ... Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format. Then, the worker retrieve that information, find / create the entry and save it.	2016-09-11 21:57:46 +02:00
Nicolas Lœuillet	40d2a29443	Replace RabbitMQ injection with CraueConfiguration	2016-09-11 21:57:09 +02:00
Nicolas Lœuillet	56c778b415	1st draft for rabbitMQ	2016-09-11 21:57:09 +02:00
Jeremy Benoist	88e88016b9	Clearing entities in the loop fail on Postgres ... It looks like when you clear entities on Postgres some references are lost and tags are not saved :-/	2016-09-11 16:30:01 +02:00
Jeremy Benoist	58fadbc9df	Fix error on EntityManager clear ... Introduced in the recent 2.5.5 release. Also updated deps.	2016-09-11 15:53:16 +02:00
Nicolas Lœuillet	c078d18372	Merge pull request #2275 from wallabag/export-dates ... Export dates from entries	2016-09-08 18:33:09 +02:00
Jeremy Benoist	9401696fe4	Export dates from entries	2016-09-08 16:49:21 +02:00
Jeremy Benoist	60faee002c	Re-user JsonResponse ... Since Symfony 3.1 we can define the json of a JsonResonse using `->setJson()`	2016-09-08 12:03:38 +02:00
Jeremy Benoist	6f23289e72	Merge pull request #2266 from wallabag/add-tags-counter ... Added tags counter in sidebar (material theme)	2016-09-05 22:20:27 +02:00
Quent-in	fee8f2312e	Occitan updated ... Line 347, I'm not sure about what I wrote to avoid and end of string started with " I had to use the simple ' in the sentence. Let me know if it was okay like so.	2016-09-05 18:55:53 +02:00
Nicolas Lœuillet	5173fd1c3d	Returned 0 instead of returning empty array for Twig Extension	2016-09-05 14:17:44 +02:00
Nicolas Lœuillet	a1d22ea7d0	Remove useless variable	2016-09-05 10:23:40 +02:00
Nicolas Lœuillet	13d9f7c96c	Switched enableCache visibility to private	2016-09-04 21:06:52 +02:00
Nicolas Lœuillet	429d86f388	Added tags counter in sidebar (material theme)	2016-09-04 20:53:28 +02:00
Jeremy Benoist	234ad94453	CS	2016-09-03 19:26:23 +02:00
Jeremy Benoist	59ddb9ae99	Remove Twig globals ... Twig Global function are called globally. This means even on a query to the api. Using a function we can decide when we want to call it. Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...	2016-09-03 19:09:28 +02:00
Jeremy Benoist	543da3e0b7	Instead of selecting the whole data, just count it ... Instead of performing a complex select (to retrieve all data for entry, etc...) just select the counter and retrieve it. Down from ~50ms to ~30ms on the unread page (with 500 items)	2016-09-03 18:11:07 +02:00
Jeremy Benoist	8f8654913c	Merge pull request #2002 from wallabag/feature-display-itemsNumber ... Feature display items number	2016-09-03 16:13:08 +02:00
Nicolas Lœuillet	b3f4a11a81	Store cache lifetime in config	2016-09-03 14:02:50 +02:00
Jeremy Benoist	5070644a12	CS	2016-09-03 11:45:59 +02:00
Jeremy Benoist	f62c3faf88	Update test ... If the database isn't found when checking for the connection it means, we can connect to the server. The InstallCommand will create the database later. Also, when checking for the SQLite connection, Doctrine creates the file (so the database). That's why the test is skipped for SQLite.	2016-09-03 10:34:27 +02:00
Jeremy Benoist	001a7bad66	Add a check for the database connection ... Checking for the driver isn't enough. We are now checking if we can etablish a connection to the database before trying to do anything. By displaying the error from the Exception (in case of error) we hope to reduce issues overload about people getting error with the database	2016-09-03 09:24:34 +02:00
Nicolas Lœuillet	b1e0a586e8	Fixed different font-size for labels in config screen ... Fix #1788	2016-09-02 10:53:22 +02:00
Nicolas Lœuillet	336262e6ee	Merge pull request #2252 from wallabag/fix-last-merge ... Fixed last merge who caused CSS/JS bugs	2016-09-02 10:27:41 +02:00
Jeremy Benoist	33adf8dc91	Merge pull request #2242 from wallabag/fix-minor-css ... Fix print / article views	2016-09-01 22:23:45 +02:00
Nicolas Lœuillet	0b0233b1ec	Enable cache for queries	2016-09-01 20:20:12 +02:00
Mateusz Rumiński	3a6c252104	Update messages.pl.yml ... add missing polish translations	2016-09-01 19:42:26 +02:00
Jeremy Benoist	209ec7cedd	Add Readability to Quickstart page	2016-09-01 13:39:55 +02:00
Jeremy Benoist	a1a1077059	Add tests on ReadabilityImport	2016-09-01 13:39:41 +02:00
Jeremy Benoist	ca2a43ae7d	Add missing translations	2016-09-01 13:39:37 +02:00
Jeremy Benoist	03e3753f6b	Add Readability import ... Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)	2016-09-01 08:00:30 +02:00
Nicolas Lœuillet	a374ac0fd3	Fixed last merge who caused CSS/JS bugs	2016-08-30 13:52:28 +02:00
Jeremy Benoist	cdd3010b47	Merge remote-tracking branch 'origin/master' into 2.1	2016-08-28 16:15:27 +02:00
Jeremy Benoist	0184e09a66	Add missing translations	2016-08-28 15:37:22 +02:00
Nicolas Lœuillet	b6520f0b15	Add untagged entries ... Fix #1631	2016-08-28 14:44:00 +02:00
Quent-in	985f5f9d05	Occitan version ... Occitan translation, I hope I properly put it where it has to be. If there reminds other textes to translate, please let me know!	2016-08-27 12:24:18 +02:00
Nicolas Lœuillet	74d68fbf25	Changed where page title is displayed	2016-08-26 21:26:21 +02:00
Nicolas Lœuillet	add0e14cff	Fixed print view for baggy theme	2016-08-26 21:20:02 +02:00
Nicolas Lœuillet	52ef497099	Fix print / article views	2016-08-26 14:35:43 +02:00
Alexandr Danilov	ceebf13fe8	Fix issue #1991: correction of the height field to add articles	2016-08-26 01:13:35 +03:00
Nicolas Lœuillet	8e06720ff3	Add icon for public share link	2016-08-25 16:19:21 +02:00
Nicolas Lœuillet	0a512eaf57	Remove text about original URL in public view	2016-08-25 15:32:38 +02:00
Alexandr Danilov	538587855a	A new version of the plugin tinydot with update on window resize	2016-08-25 16:22:47 +03:00
Alexandr Danilov	5aba43d92c	Changes in the login form: ... * The alignment of the login form centered in WebKit * Indent after the reference password recovery	2016-08-25 16:09:55 +03:00
Nicolas Lœuillet	9415bc992e	Add original link in public view of the article	2016-08-25 14:39:33 +02:00
Jeremy Benoist	60e7220406	Merge pull request #1904 from wallabag/feature-public-mode ... Share entry with a public URL	2016-08-25 09:30:51 +02:00
Jeremy Benoist	eddda878a0	Update test ... and some cleanup	2016-08-24 22:29:36 +02:00
Jeremy Benoist	a1ab7d1d32	Merge pull request #2186 from wallabag/addRegistration ... Add option to disable registration	2016-08-24 11:13:00 +02:00
Nicolas Lœuillet	78b3c31d70	Change annotation for uuid field	2016-08-24 09:07:49 +02:00
Nicolas Lœuillet	2f9927404d	Merge pull request #2230 from modos189/issue_2055 ... Cut entries title in card view: continued	2016-08-23 17:24:46 +02:00
Nicolas Lœuillet	3e860ff1ce	Change links on baggy theme	2016-08-23 16:55:49 +02:00
Nicolas Lœuillet	f1be7af446	Change share entry behavior	2016-08-23 16:49:21 +02:00
Nicolas Lœuillet	3377c938f8	Add translations	2016-08-23 16:49:21 +02:00
Nicolas Lœuillet	a7e2218e25	Add test and fix migration	2016-08-23 16:49:21 +02:00
Nicolas Lœuillet	222e09f140	Add Cache on Share Action	2016-08-23 16:49:21 +02:00
Nicolas Lœuillet	d0545b6bd6	Add migration	2016-08-23 16:49:21 +02:00
Nicolas Lœuillet	f3d0cb9106	Share entry with a public URL	2016-08-23 16:49:21 +02:00
Alexandr Danilov	28388e15c3	Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes)	2016-08-23 12:58:35 +03:00
Nicolas Lœuillet	f997ae6afb	Implement Twig_Extension_GlobalsInterface to remove deprecation	2016-08-23 07:47:55 +02:00
Nicolas Lœuillet	8315130a75	Display entries number for each category	2016-08-23 07:47:55 +02:00
Jeremy Benoist	ee4442f42a	CS	2016-08-23 07:40:36 +02:00
Thomas Citharel	7149aa5781	Proper parameter name, simplify logic & phpdoc	2016-08-23 07:40:36 +02:00
Thomas Citharel	de3d716ae4	Add option to disable registration	2016-08-23 07:40:36 +02:00
Jeremy Benoist	97e7ad4dc7	Remove duplicate pager on baggy	2016-08-23 07:36:43 +02:00
Jeremy Benoist	a0e1eafc35	Add some tests ... Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test). Moved down `deleteTagAction` because it conflicted with the new action: api_delete_tag => /api/tags/{tag}.{_format} api_delete_tags_label => /api/tags/label.{_format} And finally, throw exception when a tag is not found before removing it.	2016-08-23 07:26:58 +02:00
Thomas Citharel	9bf83f1fb8	CS	2016-08-23 07:26:58 +02:00
Thomas Citharel	4da01f492b	Delete tag or tags by label ... Tests not included	2016-08-23 07:26:58 +02:00
Jeremy Benoist	e71cef0bb8	Fix typos in field name	2016-08-23 07:26:58 +02:00
Thomas Citharel	119914e65d	added name on client	2016-08-23 07:26:58 +02:00
Nicolas Lœuillet	267e8d6361	Add tests for tag list routes	2016-08-23 07:26:18 +02:00
Nicolas Lœuillet	371bcca0f6	Translations and baggy view for tags	2016-08-23 07:26:18 +02:00
Nicolas Lœuillet	891456ba9a	Links on each tag in Tags view	2016-08-23 07:24:42 +02:00
Jeremy Benoist	79efca1e6f	Merge remote-tracking branch 'origin/master' into 2.1	2016-08-22 23:03:16 +02:00
Alexandr Danilov	474b086656	Simplify the initialization of the plugin dotdotdot	2016-08-22 23:59:20 +03:00
Alexandr Danilov	e32aea53ab	Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view	2016-08-22 23:34:44 +03:00
Thomas Citharel	9c545fe028	Added name on client ... - Fix typos in field name - Added migration for name field in API client table Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2171	2016-08-22 20:18:27 +02:00
Nicolas Lœuillet	c649d43381	Merge pull request #2222 from wallabag/add-date-on-article-view ... Added creation date and reading time on article view	2016-08-22 09:40:21 +02:00
Jeremy Benoist	d35ba2c3d6	Display text on baggy ... Instead of using icons (which aren't available) display real text for reading time & creation date	2016-08-21 22:22:34 +02:00
Jeremy Benoist	4e4e8e9899	Merge pull request #2221 from wallabag/replace-favorite-star ... Replaced favorite word/icon with star one	2016-08-21 22:11:20 +02:00
Jeremy Benoist	19d9efab32	Avoid breaking import when fetching fail ... graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf). Import doesn't handle that case and break the whole import. With that commit the import isn't stopped but the entry is just skipped. Also, as a bonus, I've added extra test on WallabagImportV2 when the json is empty.	2016-08-20 01:17:26 +02:00
Nicolas Lœuillet	e7732deb1f	Changed code indentation	2016-08-18 15:37:44 +02:00
Nicolas Lœuillet	eecd7e406d	Fixed some translations	2016-08-18 15:30:28 +02:00
Nicolas Lœuillet	4e1be104ab	Added creation date and reading time on article view ... Fix #2034	2016-08-18 15:23:19 +02:00
Nicolas Lœuillet	519ba0b5e7	Replaced favorite word/icon with star one ... Fix #2041	2016-08-18 14:27:17 +02:00
Jeremy Benoist	0cecfa2536	CS	2016-08-17 14:36:20 +02:00
Nicolas Lœuillet	e49c62fac8	Fix form user display for baggy theme	2016-08-17 11:41:46 +02:00
Nicolas Lœuillet	8f5e220327	Fix form user display when 2FA is disabled	2016-08-17 11:41:46 +02:00
Thomas Citharel	8cb869ea95	add some missing phpdoc parameters	2016-07-24 11:47:03 +02:00
charno6	75ac3e6289	Fixed typo in entry:notice:entry_saved ... "Eintag" to "Eintrag"	2016-07-23 22:40:23 +02:00
Jeremy Benoist	8c7d7c0300	Merge pull request #2199 from Simounet/facto/social-links ... Handling socials links into a config file	2016-07-21 16:17:53 +02:00
Simounet	57c608fa94	php-cs-fixer pass	2016-07-20 23:08:04 +02:00
Simounet	40288b7166	Chrome extension URL updated	2016-07-20 22:55:43 +02:00
Simounet	0e1abf392c	FIX image inside a figure element max-width (baggy theme)	2016-07-20 20:23:55 +02:00
Simounet	f64472e9f8	FIX image inside a figure element max-width	2016-07-20 19:39:24 +02:00
Simounet	39f27d6370	Handling socials links into a config file	2016-07-20 19:36:01 +02:00
Jeremy Benoist	0faeabefa7	Merge remote-tracking branch 'origin/master' into 2.1	2016-07-20 12:02:02 +02:00
benages	57b62cbf79	Fixed spelling Artúclos --> Artículos	2016-07-18 21:53:53 +02:00
Thomas Citharel	8d4152f70d	Remove fr part	2016-07-02 11:56:14 +02:00
Thomas Citharel	baef8ea26c	Fix 3rd-Party Apps links (Chrome & Firefox)	2016-07-02 11:50:32 +02:00
Thomas Citharel	1d4d9aaf29	Bring tags on entries view to baggy ... Also, a couple of UI improvement and CSS fixing	2016-07-01 13:59:30 +02:00
Thomas Citharel	4f0558a0d4	fix merge issue	2016-06-29 20:52:37 +02:00
Thomas Citharel	28803f106b	Add filter for tags on API	2016-06-29 09:55:57 +02:00
Thomas Citharel	e43c78abd9	CS	2016-06-25 23:19:21 +02:00
Thomas Citharel	e5fb89e5d3	Add since parameter	2016-06-25 21:05:50 +02:00
Thomas Citharel	e7aed21b33	add line to other languages	2016-06-24 11:45:42 +02:00
Thomas Citharel	a15022db96	minor ui fixes	2016-06-23 23:13:25 +02:00
Thomas Citharel	91826e3ca2	fix typo on icons	2016-06-23 22:51:09 +02:00
Thomas Citharel	25dc07d3c9	Add tags on entries view ... Should be tested on old browsers	2016-06-23 22:50:39 +02:00
Jeremy Benoist	f49d9ca383	Merge branch 'master' into 2.1	2016-06-23 11:47:46 +02:00
Jeremy Benoist	fb5c17a9ab	Merge pull request #2157 from wallabag/lower-upper-readingtime ... Handle only upper or only lower reading filter	2016-06-23 11:38:10 +02:00
Jeremy Benoist	2c00dddf01	fixup! Handle only upper or only lower reading filter	2016-06-23 09:41:30 +02:00
Jeremy Benoist	1bdbc39f02	Handle only upper or only lower reading filter ... When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).	2016-06-23 09:41:30 +02:00
Thomas Citharel	b46124cb9b	Fix a few french translations typos	2016-06-23 09:38:49 +02:00
Nicolas Lœuillet	49e2854d5c	Merge pull request #2142 from wallabag/v2-use-npm ... Manage assets through npm	2016-06-23 09:25:01 +02:00
Jeremy Benoist	4e411208cc	Try to find bad redirection after delete ... Instead of checking for the whole absolute url, we just check with the relative url. If the referer ends with the relative url of the deleted entry, don't redirect to the referer.	2016-06-23 09:15:50 +02:00
Jeremy Benoist	e42b13bcff	Change ManyToMany between entry & tag ... Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed	2016-06-23 09:15:50 +02:00
Jeremy Benoist	6334f2cac1	Display a message when saving an entry failed ... When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too.	2016-06-23 09:15:50 +02:00
Jeremy Benoist	f06f840c9d	Move fixtures to the right place	2016-06-23 09:15:50 +02:00
Nicolas Lœuillet	af95c09c80	Fix the deletion of Tags/Entries relation when delete an entry ... Fix #2121	2016-06-23 09:15:50 +02:00
Daniel Bartram	26ed851f52	Add unread filter test to EntryControllerTest ... Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved.	2016-06-23 09:15:50 +02:00
Daniel Bartram	710f8e69d7	Add unread filter to entries pages ... Add the ability to filter for unread pages in the filters menu.	2016-06-23 09:15:50 +02:00
Jeremy Benoist	23634d5d84	Jump to Symfony 3.1	2016-06-22 17:59:35 +02:00
Jeremy Benoist	ce0e9ec31b	Try to find bad redirection after delete ... Instead of checking for the whole absolute url, we just check with the relative url. If the referer ends with the relative url of the deleted entry, don't redirect to the referer.	2016-06-17 22:18:48 +02:00
Thomas Citharel	2e24d12027	remove block added twice	2016-06-09 19:07:41 +02:00
Thomas Citharel	5ecdfcd041	manage assets through npm ... first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version	2016-06-09 17:12:51 +02:00
Nicolas Lœuillet	f329e769fd	Merge pull request #2122 from wallabag/fix-tags-deletion ... Fix the deletion of Tags/Entries relation when delete an entry	2016-05-31 11:31:16 +02:00
Jeremy Benoist	3be047456d	Change ManyToMany between entry & tag ... Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed	2016-05-31 10:01:03 +02:00
Jeremy Benoist	39ba51ca1a	Display a message when saving an entry failed ... When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too.	2016-05-30 14:32:43 +02:00
Jeremy Benoist	2c045a210a	Move fixtures to the right place	2016-05-30 14:18:47 +02:00
Nicolas Lœuillet	f41c840b8c	Fix the deletion of Tags/Entries relation when delete an entry ... Fix #2121	2016-05-28 13:38:59 +02:00
Jeremy Benoist	839475776b	Merge pull request #2052 from danbartram/feature-filter-unread ... Add unread filter to entries pages	2016-05-27 09:57:51 +02:00
Nicolas Lœuillet	235026e2c7	Enhance option in command	2016-05-27 09:43:49 +02:00
Nicolas Lœuillet	3fad6c74fe	Add CLI import for wallabag v2 files	2016-05-27 09:43:48 +02:00
Poorchop	8fef96ee9f	Improve English translation	2016-05-23 01:04:17 -04:00
Baptiste Mille-Mathias	4b2774f8db	Don't cut entries title in card view ... Stop cutting titles arbitrary at caracter 42.	2016-05-21 10:39:49 +02:00
Nicolas Lœuillet	9f95b14dec	Merge pull request #2097 from bmillemathias/issue_2045 ... Fix image path in 2-factor authentification email	2016-05-19 09:19:01 +02:00
Jeremy Benoist	6922168420	CS	2016-05-19 07:41:54 +02:00
Jeremy Benoist	e7658cb009	Merge pull request #2092 from Rurik19/issue2089 ... Starred and Archived clears if article is already exists	2016-05-19 07:39:30 +02:00
Baptiste Mille-Mathias	2dcb1dbf05	Forgot a double quote	2016-05-19 01:51:50 +02:00
Baptiste Mille-Mathias	871f667a55	Fix image path in 2-factor authentification email ... Fix the broken url to image ressource hosted on wallabag.org	2016-05-18 21:18:41 +02:00
Nicolas Lœuillet	9b40422594	Replace vertical dots in material theme with horizontal dots	2016-05-18 14:29:41 +02:00
Yuriy Evdokimov	bba271e619	Tests for issue #2089	2016-05-18 15:37:07 +05:00
Yuriy Evdokimov	614a0bfd86	PATCH also clears starred and archived signs	2016-05-18 15:28:49 +05:00
Yuriy Evdokimov	873e380658	Starred and Archived clears if article is already exists	2016-05-18 10:30:33 +05:00
Merouane Atig	5f2971e1d4	Do not specify language in Firefox addon link	2016-05-13 11:58:10 +02:00
Daniel Bartram	30334567a3	Add unread filter test to EntryControllerTest ... Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved.	2016-05-09 19:48:28 +01:00
Daniel Bartram	733b2cf19b	Add unread filter to entries pages ... Add the ability to filter for unread pages in the filters menu.	2016-05-09 14:56:52 +01:00
Nicolas Lœuillet	1221f5315d	Fix translation for validators ... Fix #2003	2016-05-07 13:24:14 +02:00
Jeremy Benoist	f54de6817e	Merge pull request #2020 from wallabag/fix-number-entries-per-tag ... Fix number of entries in tag/list	2016-05-07 11:09:37 +02:00
Daniele Conca	a0640406b4	Update messages.it.yml ... other translations added	2016-05-05 17:32:49 +02:00
Daniele Conca	bb7a39d1ed	Update messages.it.yml	2016-05-04 11:59:07 +02:00
Nicolas Lœuillet	d9926005b1	Rename getEntriesByUser method to getEntriesByUserId	2016-05-04 11:42:52 +02:00
Nicolas Lœuillet	09e5b9391e	Add pagination bar at the bottom of the page ... Fix #2021	2016-05-03 21:44:57 +02:00
Nicolas Lœuillet	e7cd089fa6	Fix pagination bar on small devices ... Fix #2008	2016-05-03 21:27:07 +02:00
Nicolas Lœuillet	12c697562e	Fix number of entries in tag/list ... Fix #2006	2016-05-03 21:12:40 +02:00
Daniele Conca	439c7e41a3	Create messages.it.yml ... baseline for italian translations (cloned from english)	2016-05-03 18:16:36 +02:00
Jeremy Benoist	97c8eb3c23	Merge pull request #2013 from wallabag/fix-display-all-tags ... Fix tags listing	2016-05-03 10:07:34 +02:00
Nicolas Lœuillet	e9023a16eb	Remove useless method	2016-05-03 09:39:34 +02:00
Jeremy Benoist	2142c714ef	Merge pull request #1976 from wallabag/fix-filter-readingTime ... Fix filter reading time	2016-05-03 09:05:31 +02:00
Jeremy Benoist	045859a2b5	Merge pull request #2005 from wallabag/fix-readingspeed-not-defined ... Fix reading speed not defined when user was created via config page	2016-05-03 09:04:02 +02:00
Nicolas Lœuillet	2a007fe43d	Fix tags listing ... Fix #1994 * Remove unused method in tag repository	2016-05-02 21:32:47 +02:00
Nicolas Lœuillet	c4c062cce0	Add test to check reading time filter	2016-05-02 21:14:23 +02:00
Nicolas Lœuillet	8389074180	Add test for creation of new user in config page	2016-05-02 20:19:57 +02:00
Nicolas Lœuillet	51a15609b3	Set the title via POST /api/entries ... Fix #2009	2016-05-02 12:50:42 +02:00
Nicolas Lœuillet	823397f2d6	Fix reading speed not defined when user was created via config page ... Fix #2004	2016-04-30 15:06:31 +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
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	4a25bef077	Update links in documentation	2016-04-19 20:03:34 +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
jami7	5c2c1a6434	Update messages.es.yml	2016-04-16 14:04:39 -10: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	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
Nicolas Lœuillet	c31ea8a409	Remove useless dependancy	2016-04-12 21:47:16 +02:00
Nicolas Lœuillet	c95e39c51a	Lost in translation pager	2016-04-12 20:38:56 +02:00
Nicolas Lœuillet	63995be5ee	Fix display for Next/Previous link when they are disabled	2016-04-12 18:03:40 +02:00
Nicolas Lœuillet	1880da7420	Restore old behavior for OutOfRangeCurrentPageException	2016-04-12 16:40:18 +02:00
Nicolas Lœuillet	76cd8dbb05	Fix tests	2016-04-12 16:32:01 +02:00
Nicolas Lœuillet	624a7c6df1	Improve pagination when user has lot of entries ... Fix #1905 * Usage of whiteoctober/WhiteOctoberPagerfantaBundle	2016-04-12 16:04:17 +02:00
Nicolas Lœuillet	80bd17f00d	Merge pull request #1911 from wallabag/title-on-title-entry ... add title hover on entry titles	2016-04-12 14:54:59 +02:00
Thomas Citharel	1b8b3859c0	Add title hover on entry titles	2016-04-12 14:30:42 +02:00
Jeremy Benoist	443cff9840	Fix MySQL tests on HHVM	2016-04-12 12:37:10 +02:00
Jeremy Benoist	4094ea4771	Convert array + phpDoc ... Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter	2016-04-12 12:25:29 +02:00
Jeremy Benoist	637dc4bb21	Move setup config outside setupAdmin ... If user doesn't want to create a new admin (even if it's recommended) the internal config weren't created resulting in error when using the interface.	2016-04-11 19:37:29 +02:00
Nicolas Lœuillet	15e9483323	Merge pull request #1823 from wallabag/translation-fa ... Translation fa	2016-04-10 20:00:03 +02:00
Nicolas Lœuillet	c5dede8445	Merge pull request #1903 from wallabag/force-server-version ... Force server version to avoid connexion error	2016-04-10 19:57:45 +02:00
Nicolas Lœuillet	e9497f6fc0	Merge pull request #1901 from wallabag/spanish ... Update Spanish translation	2016-04-10 15:43:40 +02:00
Jeremy Benoist	c71d83b60c	Merge pull request #1887 from wallabag/v2-duplicate-bookmarklet ... Fix duplicate article when added via the bookmarklet	2016-04-10 15:37:33 +02:00
Jeremy Benoist	f642863ff2	Merge pull request #1895 from wallabag/v2-fix-entries-api ... All the entries are fetched via GET /api/entries	2016-04-10 15:37:05 +02:00
Jeremy Benoist	69c21157ba	Force server version to avoid connexion error ... When installing a new project with MySQL, if the database doesn't exist before installation will fail because DBAL will try to get the server version by querying it. And since this query is done using the default database connexion and since the database doesn't exist, DBAL can't connect to the server.	2016-04-10 15:34:32 +02:00
Jeremy Benoist	b351d0494b	Fix FA translations indentation	2016-04-10 14:33:11 +02:00
Masoud Abkenar	6d0db75328	Update messages.fa.yml	2016-04-10 14:33:11 +02:00
Jeremy Benoist	eaec84fcd3	Uncommented translated ES lines ... Also, turn yaml lint into a more versbose check	2016-04-10 14:21:42 +02:00
Nicolas Lœuillet	834efe84ac	Change visibility of checkIfEntryAlreadyExists method to private	2016-04-10 14:20:39 +02:00
jami7	661d5ae0cf	Update messages.es.yml ... On line 103, I'm not sure what symbol that is that looks like this (<<) but it looks smaller? Where is that? Should I just copy and paste it? And just to clarity, please look at line 101 too cause I'm not too sure if/how I change the stuff within <...> I stopped mid line in 103 just until I get clarification on this. Thanks.	2016-04-10 14:18:03 +02:00
jami7	dd4997d705	Update messages.es.yml	2016-04-10 14:17:35 +02:00
Nicolas Lœuillet	0135c98b24	Remove int cast	2016-04-10 14:15:21 +02:00
Jeremy Benoist	54ecbb41d6	Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material ... Fix estimated reading time in material view	2016-04-10 14:12:13 +02:00
Jeremy Benoist	19a7ea2a44	Merge pull request #1896 from wallabag/v2-fix-internal-settings ... Fix internal settings	2016-04-10 09:49:10 +02:00
Jeremy Benoist	2504fe46ed	Merge pull request #1894 from wallabag/v2-fix-doc-link ... Fix documentation link in developer page	2016-04-10 09:44:48 +02:00
Nicolas Lœuillet	7ead8a0d9d	Fix estimated reading time in material view ... Fix #1893	2016-04-10 08:48:53 +02:00
Nicolas Lœuillet	cb48a569e0	Fix internal settings ... Fix #1867: remove download_picture setting and manage show_printlink in material theme	2016-04-09 21:34:50 +02:00
Nicolas Lœuillet	5c3ca4fe9e	All the entries are fetched via GET /api/entries ... Fix #1863: only the unread entries were fetched with GET /api/entries entrypoint. Now, all the entries are fetched	2016-04-09 21:13:56 +02:00
Nicolas Lœuillet	808f541ea9	Fix documentation link in developer page	2016-04-09 20:43:22 +02:00
Nicolas Lœuillet	7a2157b8d7	Fix typo on configuration page	2016-04-09 14:04:43 +02:00
Nicolas Lœuillet	b00a89e08f	Refactor EntryController	2016-04-09 13:44:54 +02:00
Nicolas Lœuillet	f652f41dab	Fix duplicate article when added via the bookmarklet	2016-04-08 15:41:05 +02:00
Jeremy Benoist	e969c2a7ef	Merge pull request #1879 from wallabag/v2-tag-field-position ... Move tag form in Material theme	2016-04-08 13:51:20 +02:00
Nicolas Lœuillet	77b9db87b8	Merge pull request #1804 from wallabag/j0k3r-patch-1 ... Force user-agent for iansommerville.com	2016-04-08 11:18:44 +02:00
Jeremy Benoist	6a986910b6	Merge pull request #1868 from wallabag/v2-tagrule-baggy ... Remove keyboard shortcut and add tagging rule panel in baggy	2016-04-07 14:10:08 +02:00
Nicolas Lœuillet	c6cbe75b2e	Move tag form in Material theme	2016-04-07 13:47:35 +02:00
Nicolas Lœuillet	c802181126	Documentation about wallabag API	2016-04-06 11:30:41 +02:00
Nicolas Lœuillet	8687bcd0c9	Remove keybaord shortcut and add tagging rule panel in baggy	2016-04-05 22:29:47 +02:00
Nicolas Lœuillet	4a749cad8d	Round estimated time and add reading speed for Baggy	2016-04-05 15:35:01 +02:00
Nicolas Lœuillet	b5cf84bdf6	Fix Archive page title translation	2016-04-04 08:00:31 +02:00
Thomas Citharel	a119acd15d	Merge pull request #1835 from wallabag/v2-prepare-v2 ... 🚀 Prepare v2.0.0 🎂	2016-04-03 22:11:17 +02:00
Nicolas Lœuillet	163517da79	Remove useless CSS	2016-04-03 20:35:53 +02:00
Nicolas Lœuillet	0795d04916	Hide search buttons	2016-04-03 20:25:43 +02:00
Nicolas Lœuillet	eff75729a1	🚀 Prepare v2.0.0 🎂	2016-04-03 18:56:53 +02:00
Jeremy Benoist	c61b68e8a6	Check selected PDO driver on install ... Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists.	2016-04-01 16:44:51 +02:00
Jeremy Benoist	1695a6fecd	Fix quotes for OC	2016-04-01 10:34:51 +02:00
Jeremy Benoist	69726ec78e	Fix simple quote	2016-04-01 10:16:06 +02:00
Quent-in	dc89968c58	Update oc version ... Complet	2016-04-01 08:51:29 +02:00
Quent-in	9191d8a640	Trad. Occitan ... WIP	2016-03-30 13:17:40 +02:00
jami7	4063d821a3	Update messages.es.yml	2016-03-28 10:53:35 -10:00
Nicolas Lœuillet	e2dda63152	Merge pull request #1820 from wallabag/import-refacto ... Refacto wallabag import	2016-03-28 18:52:22 +02:00
jami7	ff6b683bb3	Update messages.es.yml	2016-03-28 05:34:56 -10:00
Jeremy Benoist	b787a7757e	Refacto wallabag import ... Use an abstract class to store all common action from wallabag vX import. Move specificity in v1 & v2 import.	2016-03-28 16:43:33 +02:00
Jeremy Benoist	0e49487bb0	Remove some complexicity in InstallCommand	2016-03-28 14:18:50 +02:00
Nicolas Lœuillet	ba2157b270	Merge pull request #1805 from wallabag/v2-assign-comma-tags ... Fix #1768 Split tags with commas from UI	2016-03-28 09:42:13 +02:00
Jeremy Benoist	8f336fda64	Tags were not imported in wallabag v2 import ... Also, simplify exportAs matching format	2016-03-27 23:58:37 +02:00
Jeremy Benoist	4d0ec0e721	Fix some Scrutinizer issues	2016-03-27 20:54:57 +02:00
Jeremy Benoist	5d6f6f56a2	Some cleanup ... - travis tabulation - extra namespace definition in entities	2016-03-27 20:36:35 +02:00
Jeremy Benoist	2baca964f3	Simplify tag creation from entry ... Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job. So it simplify the controller.	2016-03-27 17:09:33 +02:00
Mateusz Rumiński	4dc9f8d037	Fix Indentation problem	2016-03-26 17:38:34 +01:00
Mateusz Rumiński	005c0d370f	Update messages.pl.yml ... Complete polish translation of messages file	2016-03-25 19:20:37 +01:00
Julian Oster	58a0ca1651	Complete messages.de.yml	2016-03-24 13:09:49 +01:00
Nicolas	842a62e293	fix type diaspora* share	2016-03-21 17:03:43 +01:00
Nicolas Lœuillet	7dbed56857	Translate flash message in baggy theme	2016-03-21 15:44:23 +01:00
Nicolas Loeuillet	5a4ee4ae0f	Split tags with commas from UI	2016-03-21 14:06:07 +01:00
Jeremy Benoist	f3e49264f2	Add reading time translation	2016-03-21 10:00:41 +01:00
Jeremy Benoist	f92b5de7ac	Convert more languages	2016-03-20 21:56:42 +01:00
Jeremy Benoist	1381db4835	Translation typos ... Fix #1793	2016-03-20 21:56:42 +01:00
Jeremy Benoist	3fae7f1d08	Add missing developer page	2016-03-20 21:56:42 +01:00
Jeremy Benoist	a0c6c244d9	Convert french translation	2016-03-20 21:56:42 +01:00
Jeremy Benoist	b308b26339	CS	2016-03-20 21:12:22 +01:00
Jeremy Benoist	4204a06b77	Add flashes messages	2016-03-20 21:12:22 +01:00
Jeremy Benoist	4f9cf232f8	Improve test failure readability ... If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text. So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read.	2016-03-20 21:12:22 +01:00
Jeremy Benoist	0d42217e4e	Convert english translation file ... - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`	2016-03-20 21:12:22 +01:00
Jeremy Benoist	e71c376db9	Force user-agent for iansommerville.com ... When using the default User Agent, the website returns a 403. By forcing the User Agent for this domain, we got the proper behavior: a 200 Since we can't _append_ new user agent to the default graby configuration, we need to rewrite all the default config + the new one. Fix #1801	2016-03-18 20:55:54 +01:00
Jeremy Benoist	f39e94ace3	Merge pull request #1767 from wallabag/v2-setting-for-reading-time ... Setting for reading time	2016-03-18 14:30:38 +01:00
Nicolas Lœuillet	1b64a84b78	Improved tests	2016-03-18 14:01:50 +01:00
Nicolas Lœuillet	ec7c67badc	Merge pull request #1799 from wallabag/v2-fix-tabs-display-material ... fix tabs display on mobile view	2016-03-18 12:52:40 +01:00
Nicolas Lœuillet	78becd5401	Fix documentation and add help message in Baggy	2016-03-18 12:36:52 +01:00
Thomas Citharel	bc2b947cd5	add check	2016-03-16 22:47:12 +01:00
Thomas Citharel	0cd0d6eb8c	fix updating entry status through API	2016-03-16 22:43:32 +01:00
Thomas Citharel	2f60e5ea75	check if archive/star parameters without quotes work	2016-03-16 22:22:12 +01:00
Thomas Citharel	189ef6342a	use integers for archived/starred status	2016-03-16 22:22:12 +01:00
Thomas Citharel	0d3043a29c	fix api properties and typo	2016-03-16 22:22:12 +01:00
Thomas Citharel	2cc7de1e93	fix tabs display on mobile view	2016-03-16 22:15:01 +01:00
Thomas Citharel	3107f92acb	Don't add entry through API if it already exists	2016-03-16 21:07:01 +01:00
Thomas Citharel	bc44aa5784	add tests on user in API responses	2016-03-15 19:31:31 +01:00
Nicolas Lœuillet	6432b9277e	Replace slider with select	2016-03-14 13:49:47 +01:00
Nicolas Lœuillet	37b371726b	Translation and documentation	2016-03-14 13:01:32 +01:00
Nicolas Lœuillet	db1d4b1e19	Fix default value and add baggy implementation	2016-03-14 13:01:31 +01:00
Nicolas Lœuillet	889c1cf328	Fixed fixtures for config	2016-03-14 13:01:31 +01:00
Nicolas Lœuillet	bca5485946	Added setting to have a personal reading time	2016-03-14 13:01:31 +01:00
Nicolas Lœuillet	17b3d026fd	Merge pull request #1786 from wallabag/v2-restrict-user-infos ... API shows just what needed for user	2016-03-14 06:15:46 +01:00
Thomas Citharel	7d1fdab2bb	API shows just what needed for user	2016-03-13 20:17:52 +01:00
Thomas Citharel	c9c8345a4a	add refresh-token grant-type	2016-03-13 17:53:56 +01:00
Jeremy Benoist	b95ffda2a1	Fix hazardous bug with Postgres ... Instead of retrieving a random annotation, sort them to be sure they are all the same no matter the database used	2016-03-12 10:45:14 +01:00
Jeremy Benoist	09d8bb6fa2	Improve tests ... - add more tests for coverage - add a test on annotation deletion - fix post annontation with ranges	2016-03-11 17:59:42 +01:00
Nicolas Lœuillet	cebb42234c	Added 'wallabag' in page title	2016-03-08 15:22:35 +01:00
Nicolas Lœuillet	3b32c122ab	Change documentation links in quickstart	2016-03-08 11:21:40 +01:00
Nicolas Lœuillet	d442cf4a92	Merge pull request #1761 from wallabag/v2-API-version ... V2 api version	2016-03-08 10:09:57 +01:00
Nicolas Lœuillet	807037884f	Merge pull request #1675 from wallabag/v2-create-api-client ... Ability to create new client for the API	2016-03-08 10:09:39 +01:00
Thomas Citharel	6f8310b445	typos & cs	2016-03-08 09:22:25 +01:00
Vincent	9761bfa18e	write test for version	2016-03-07 15:16:27 +01:00
Vincent	2b4770301c	Add version in API	2016-03-07 15:00:03 +01:00
Jeremy Benoist	d11eb2e461	Fix translations mistake ... In Material template, move the developer link in the left menu (like in baggy)	2016-03-07 11:05:14 +01:00
Jeremy Benoist	f17281417c	Translate "how to" page	2016-03-07 09:20:20 +01:00
Jeremy Benoist	2766668b59	Use external js & css	2016-03-07 08:58:08 +01:00
Jeremy Benoist	1256f6fe34	Add translations	2016-03-05 22:29:58 +01:00
Jeremy Benoist	9bf15f0269	Add listing clients ... Rename route to be more consistive (ie: prefixed with developer_)	2016-03-05 21:44:39 +01:00
Jeremy Benoist	2c2308b783	Cleanup form ... - Avoid too much hidden data in the form (instead of manually define the submit button and hide the default, use the default one !) - Fix HTML syntax in client_parameters - Add developer link in baggy menu - Fix space between link in material footer	2016-03-05 20:04:19 +01:00
Jeremy Benoist	e68568cd5b	Merge pull request #1750 from wallabag/v2-quickstart-documentation ... Documentation about filters / Quickstart changes	2016-03-04 16:14:39 +01:00
Nicolas Lœuillet	d89908aed3	Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-read ... Mark all imported articles as read	2016-03-04 16:12:45 +01:00
Jeremy Benoist	fba9e7d44d	Remove 'content' from API ... Waiting to find a good solution to avoid side problem since user can no define the content	2016-03-04 11:46:18 +01:00
Thomas Citharel	11a452813c	use booleans instead of empty	2016-03-04 11:39:21 +01:00
Thomas Citharel	816ad4051b	add more properties for entries #1634	2016-03-04 11:39:20 +01:00
Jeremy Benoist	79d0e38e7f	Adding test ... Reformat json file (thanks pro.jsonlint.com)	2016-03-04 10:04:51 +01:00
Thomas Citharel	c32ae320fe	cs & tests for wllbg v1 import	2016-03-03 10:03:40 +01:00
Thomas Citharel	c10fcb3bbb	french translation & pocket	2016-03-03 10:03:40 +01:00
Thomas Citharel	fe8b37c137	Mark all imported articles as read	2016-03-03 10:03:28 +01:00
Nicolas Lœuillet	76a9bc4797	Add new links in quickstart	2016-03-03 07:30:05 +01:00
Juanjo Benages	348e2b4852	Spanish translation	2016-03-01 22:24:34 +01:00
Juanjo Benages	bd5b3ea8ea	Spanish translation	2016-03-01 22:20:42 +01:00
Juanjo Benages	0e576d2163	Start of the spanish translation	2016-03-01 21:00:35 +01:00
Jeremy Benoist	4be43814e2	Merge pull request #1738 from wallabag/v2-prepare-beta1 ... Prepare wallabag for first beta 🚀	2016-03-01 09:00:42 +01:00
goofy-bz	5d0f104bf0	minor typofix + missing quotes ... Added quotes to be reviewed	2016-02-29 21:55:06 +01:00
Nicolas Lœuillet	6e3d65ccb0	Prepare wallabag for first beta 🚀	2016-02-29 21:34:36 +01:00
Nicolas Lœuillet	5bf8f3f164	Remove comments	2016-02-29 21:28:37 +01:00
Thomas Citharel	5bc2da5628	Add password for auth	2016-02-29 21:28:25 +01:00
Nicolas Lœuillet	8a4690b6a5	add tests	2016-02-29 21:28:25 +01:00
Nicolas Lœuillet	abc329453b	Enhance documentation and create a form to create a new client	2016-02-29 21:28:25 +01:00
Nicolas Lœuillet	6a2c524a2c	API: rename application to client	2016-02-29 21:28:25 +01:00
Nicolas Lœuillet	b6321bed7b	Added developer documentation	2016-02-29 21:28:25 +01:00
Nicolas Lœuillet	24152cdb5e	Fix #1597: first draft to create new client for the API	2016-02-29 21:28:25 +01:00
Jeremy Benoist	3c39f5ac41	Skipping all Posgres test for wallabag:install ... We already faced this problem but we are facing it again. d502762598 It seems we can drop a database properly using wallabag:install. The server log keep saying: ERROR: source database "template1" is being accessed by other users DETAIL: There is 1 other session using the database. STATEMENT: CREATE DATABASE "wallabag_test" Which means, it can't remove the database wallabag_test because one other person is using it.	2016-02-29 16:23:36 +01:00
Jeremy Benoist	a19a371ae7	Remove extra definition ... Since Symfony 3.0.3 has been released	2016-02-29 09:23:15 +01:00
Morten Juhl-Johansen Zölde-Fejér	8249b988cc	added newline	2016-02-27 17:19:17 +01:00
Morten Juhl-Johansen Zölde-Fejér	2b788cadab	Adding Danish translations to Wallabag v2	2016-02-27 16:00:19 +01:00
Nicolas Lœuillet	b07c7dfe78	Regenerate Annotator with idAnnotation instead of idComment	2016-02-26 18:14:50 +01:00
Nicolas Lœuillet	4dc872238a	Rename CommentBundle with AnnotationBundle	2016-02-26 18:14:42 +01:00
Thomas Citharel	9eab365e28	changed french translation from commentaire to annotation	2016-02-26 18:14:42 +01:00
Thomas Citharel	a772d16b12	display how much comments there are for an entry	2016-02-26 18:14:42 +01:00
Thomas Citharel	2b6e65a5e3	Move annotatorjs to the bottom of the body ... So that the "article" tag is loaded before	2016-02-26 18:14:27 +01:00
Nicolas Lœuillet	7720cca532	Add annotator in baggy theme ... + Documentation about annotations	2016-02-26 18:14:12 +01:00
Thomas Citharel	f38e03dc02	Comment work with annotator v2 ... - add missing annotator.js file and fix typo - edit & delete routes, started tests - basic tests	2016-02-26 18:13:17 +01:00
Nicolas Lœuillet	575e6907e5	Change remove tag icon in entry view with material theme	2016-02-26 08:58:36 +01:00
Olivier Mehani	ef186de38a	Make English welcome message more natural ... sed -i "s/Welcome on wallabag/Welcome to wallabag/" Signed-off-by: Olivier Mehani <shtrom@ssji.net>	2016-02-25 11:32:40 +11:00
Jeremy Benoist	f2fcb65b44	Fix wrong variable name ... > The variable $requirement does not exist.	2016-02-24 14:49:51 +01:00
Jeremy Benoist	f83125d2f5	Merge pull request #1716 from wallabag/v2-enhance-requirements-installation ... Fix #1603: Enhance requirements in InstallCommand	2016-02-24 14:47:35 +01:00
Jeremy Benoist	d7cc16c8b5	Merge pull request #1710 from wallabag/v2-message-graby-fails ... Fix #811: Display a human message when graby fails to fetch articles	2016-02-24 08:43:17 +01:00
Thomas Citharel	0a7e695975	remove unused functions & clean composer.json	2016-02-23 23:29:25 +01:00
Thomas Citharel	db847ca0b7	add composer extensions check & function_exists checks	2016-02-23 19:06:37 +01:00
Nicolas Lœuillet	fc6020b2c8	Enhance requirements in InstallCommand	2016-02-23 16:41:38 +01:00
Nicolas Lœuillet	ecb266d0ec	replace contributors with a link to github	2016-02-23 16:18:13 +01:00
Nicolas Lœuillet	4a2c089c68	Add contributors and 3rd party libraries	2016-02-23 16:04:01 +01:00
Jeremy Benoist	90280df080	Change wording for create a new user	2016-02-23 14:38:42 +01:00
Nicolas Lœuillet	bb17ddea61	changed error message	2016-02-22 22:14:56 +01:00
Jeremy Benoist	b6c00b0b80	Add tests	2016-02-22 13:33:22 +01:00
Nicolas Lœuillet	fe5597c433	Display a human message when graby fails to fetch articles	2016-02-22 13:30:17 +01:00
Jeremy Benoist	e5b5270962	Add translation	2016-02-22 11:44:39 +01:00
Jeremy Benoist	a4f42c59f0	Use internal config instead for demo	2016-02-22 11:44:39 +01:00
Nicolas Lœuillet	d8d56448c9	add a username for demonstration mode	2016-02-22 11:43:29 +01:00
Nicolas Lœuillet	36f20a6570	typo	2016-02-22 11:43:28 +01:00
Nicolas Lœuillet	6c9f50a662	Demonstration mode to prevent password changes	2016-02-22 11:43:28 +01:00
Jeremy Benoist	12b5a8cea1	Merge pull request #1702 from wallabag/v2-piwik ... Added Piwik implementation	2016-02-22 11:24:41 +01:00
Jeremy Benoist	077ddbe1ae	Use a different way to use piwik	2016-02-22 11:11:08 +01:00
Nicolas Lœuillet	0cde91cc6f	Merge pull request #1699 from wallabag/v2-assign-tag ... Move assignTagsToEntry in ContentProxy helper	2016-02-19 21:21:47 +01:00
Maxime LECLERCQ	671a2b887f	Fix #1551 - Redirect to the last page when current page is out of range	2016-02-19 16:02:31 +01:00
Nicolas Lœuillet	07643dde08	Fix #1137: implemented Piwik	2016-02-19 15:27:57 +01:00
Jeremy Benoist	c2656f96d4	Move assignTagsToEntry in ContentProxy helper	2016-02-19 14:22:20 +01:00
Jeremy Benoist	befa6f2fe9	Merge pull request #1696 from wallabag/v2-french-translations-missing ... Add some missing french translations	2016-02-18 14:44:26 +01:00
Nicolas Lœuillet	04c0737817	Add some missing french translations	2016-02-18 13:59:02 +01:00
Nicolas Lœuillet	fdec3acab1	Merge pull request #1688 from mruminski/patch-1 ... Create messages.pl.yml	2016-02-18 13:16:49 +01:00
mruminski	660d66cabd	Update messages.pl.yml ... change ' to ""	2016-02-18 11:47:35 +01:00
mruminski	1f8f9eaac8	Update messages.pl.yml ... fix some mistakes in translation	2016-02-18 11:27:11 +01:00
Thomas Citharel	f37c9c3348	translate estimated time minutes	2016-02-18 01:36:02 +01:00
Jeremy Benoist	93d0aa40bb	Merge pull request #1689 from mruminski/patch-2 ... Create validators.pl.yml	2016-02-18 00:02:53 +01:00
Jeremy Benoist	db0e34e2ce	Merge pull request #1687 from 0wnrepo/v2 ... Translated another two files into romanian.	2016-02-18 00:00:46 +01:00
mruminski	e87638227f	Create validators.pl.yml ... Polish translation	2016-02-17 22:23:51 +01:00
mruminski	75ff0e6e32	Create messages.pl.yml ... Polish translation	2016-02-17 22:18:30 +01:00
steve	6a88b61cf1	Translated another two files into romanian.	2016-02-17 22:40:26 +02:00
Masoud Abkenar	ebac4090b5	Added Persian (fa) (فارسی) translation	2016-02-17 15:37:29 +01:00
0wnrepo	ab25e399f0	Fix \&amp;	2016-02-17 13:39:23 +02:00
steve	d8f5b27012	Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română".	2016-02-17 01:56:51 +02:00
Masoud Abkenar	b7c47a2a86	Create messages.fa.yml ... Translation file for the 'Persian' language. Also recognized by fa_IR. Also known (in the Persian language) as Farsi. Also written like فارسی in Persian. All said, please call the language just 'Persian'.	2016-02-16 16:38:08 +01:00
Nicolas Lœuillet	f6249b67f6	Merge pull request #1668 from wallabag/v2-stuff ... Few updates	2016-02-16 12:27:43 +01:00
Jeremy Benoist	9e33bc9dfd	Typos	2016-02-16 11:39:24 +01:00
Nicolas Lœuillet	559cd55bc8	Merge pull request #1672 from wallabag/v2-improve-baggy-theme ... improve baggy theme (add new tag panel)	2016-02-15 19:22:13 +01:00
Thomas Citharel	a8d5f8971e	fix typos	2016-02-15 17:04:48 +01:00
Thomas Citharel	56349e470a	improve baggy theme (add new tag panel)	2016-02-14 20:12:03 +01:00
Thomas Citharel	e8d8026242	display pictures properly	2016-02-14 19:10:33 +01:00
Jeremy Benoist	daa2b7e7c3	More translations	2016-02-12 16:59:15 +01:00