Commit Graph

4 Commits

Author SHA1 Message Date
Dan
06f3053af8 Merge branch 'develop' into asyncio-dev 2019-08-07 16:37:55 +02:00
Mario A
2aefbfd531 Add better support for nested entities (both for HTML and Markdown) (#297)
* Added better support for nested entities, both for HTML and Markdown

* Tiny style fix

* Make use of pre-defined constants
2019-08-07 13:48:21 +02:00
Dan
8ef97f2177 Merge branch 'develop' into asyncio
# Conflicts:
#	pyrogram/client/methods/messages/edit_message_text.py
#	pyrogram/client/methods/messages/send_animation.py
#	pyrogram/client/methods/messages/send_audio.py
#	pyrogram/client/methods/messages/send_cached_media.py
#	pyrogram/client/methods/messages/send_document.py
#	pyrogram/client/methods/messages/send_message.py
#	pyrogram/client/methods/messages/send_photo.py
#	pyrogram/client/methods/messages/send_video.py
#	pyrogram/client/methods/messages/send_voice.py
#	pyrogram/client/parser/html.py
#	pyrogram/client/parser/markdown.py
#	pyrogram/client/types/input_message_content/input_text_message_content.py
2019-06-26 19:34:49 +02:00
Dan
8d852cb47e Implement strict and loose markdown parsing
This is enabled by default:

  - strict: only markdown syntax is parsed
  - loose: both markdown and html syntax are parsed
2019-06-26 16:05:09 +02:00