OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-11-22 15:17:00 +01:00
Code Issues Projects Releases Packages Wiki Activity
866 commits 10 branches 119 tags 37 MiB
Commit graph

866 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jannes Höke
5b36a85e63 release notes 4.0rc1 2016-04-22 16:27:49 +02:00
Jannes Höke
7daf26198e bump version to 4.0rc1 2016-04-22 16:24:32 +02:00
Jannes Höke
8c0de59d46 fix rst syntax 2016-04-22 16:13:24 +02:00
Jannes Höke
d46d9a711d Merge branch 'bot-api-2.0' into dispatcher-rework 
Conflicts:
	docs/source/telegram.ext.jobqueue.rst
	docs/source/telegram.rst
 2016-04-22 16:12:45 +02:00
Leandro Toledo
b444cd7bce Adding new modules to docs #232 2016-04-22 11:07:44 -03:00
Jannes Höke
93e15fa9f8 Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-22 15:36:51 +02:00
Jannes Höke
d383c10d4e remove check for inline_query 2016-04-22 15:36:46 +02:00
Jannes Höke
012bbe1307 update readme to bot-api-2.0 2016-04-22 15:34:21 +02:00
Jannes Höke
4faa4774bd Remove bot token 2016-04-22 09:11:52 +02:00
Jannes Höke
cb79317354 remove lazy import of JobQueue 2016-04-21 20:37:43 +02:00
Jannes Höke
cfdfdeb4fc Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-21 17:20:05 +02:00
Leandro Toledo
67a2d31edf Merge branch 'bot-api-2.0' of https://github.com/python-telegram-bot/python-telegram-bot into bot-api-2.0 2016-04-21 12:18:59 -03:00
Leandro Toledo
0669c72fe3 Fixing little princes Python 2.6 string format arg #232 2016-04-21 12:18:51 -03:00
Leandro Toledo
185c40da79 Fixing little princes Python 2.6 string format arg #232 2016-04-21 12:15:37 -03:00
Leandro Toledo
5315e072cb PEP8 for Py2 #232 2016-04-21 11:59:18 -03:00
Leandro Toledo
a8255e4f51 Revert switch_inline_query #232 2016-04-21 11:42:02 -03:00
Leandro Toledo
e56c6dfab6 Revert "Minor fixes #232" 
This reverts commit 720c4d22d8.
 2016-04-21 11:20:09 -03:00
Leandro Toledo
263310be36 switch_inline_query defaults to empty string #232 2016-04-21 11:02:34 -03:00
Leandro Toledo
720c4d22d8 Minor fixes #232 2016-04-21 10:56:38 -03:00
Leandro Toledo
3be8b9ecb9 Should fix empty string but set args #232 2016-04-21 09:56:57 -03:00
Leandro Toledo
bb36c725af More refactoring and docstrings #232 2016-04-21 09:21:12 -03:00
Leandro Toledo
ba7e1cada7 Bot class refactor and its docstrings #232 2016-04-21 08:15:38 -03:00
Jannes Höke
9bf5da5ed3 add test for callback query handler 2016-04-21 13:07:44 +02:00
Jannes Höke
c0dd9c6ffc always set webhook_url 2016-04-21 12:57:03 +02:00
Leandro Toledo
9a96ad8efd Unused import #232 2016-04-19 09:12:22 -03:00
Leandro Toledo
fc277d7393 Refactor of telegram.Bot class and docstrings #232 2016-04-19 09:04:25 -03:00
Jannes Höke
48eb623f15 Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-19 01:24:02 +02:00
Leandro Toledo
9a340d2ea9 Endorsing if empty or 0 or empty string and minor typo fix #232 2016-04-18 20:18:32 -03:00
Jannes Höke
693df6dc2c Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-19 00:08:59 +02:00
Jannes Höke
a98919a86e fix cache_time==0 case 2016-04-19 00:08:47 +02:00
Jannes Höke
9790d6d8dc Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-18 21:35:50 +02:00
Jannes Höke
7913d09295 fix message.to_dict 2016-04-18 21:35:39 +02:00
Jannes Höke
1db337fe2b Merge branch 'master' into dispatcher-rework 2016-04-18 21:23:14 +02:00
Leandro Toledo
b40a59f509 Merge pull request #240 from python-telegram-bot/os_exit 
exit immediately if receiving second interrupt #224
 2016-04-18 16:22:21 -03:00
Jannes Höke
0d9d5032ef exit immediately if receiving second interrupt #224 2016-04-18 19:21:57 +02:00
Jannes Höke
de5619f3ca tests 2016-04-18 18:50:49 +02:00
Jannes Höke
b6fceefc80 documentation 2016-04-18 18:13:54 +02:00
Jannes Höke
687a3b0ba1 dispatcher: also break on errors in checkHandler 2016-04-18 17:15:41 +02:00
Jannes Höke
bf5ba9a369 Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-17 22:22:52 +02:00
Jannes Höke
d879a0d018 convert reply_markup to json 2016-04-17 22:11:29 +02:00
Jannes Höke
ad211655ea Merge branch 'master' into dispatcher-rework 
Conflicts:
	README.rst
 2016-04-17 12:45:31 +02:00
Jannes Höke
3a0eb588cb Merge branch 'bot-api-2.0' into dispatcher-rework 2016-04-17 12:43:59 +02:00
Jannes Höke
c9bfa71ff9 decode new message fields 2016-04-17 12:43:34 +02:00
Jannes Höke
5f19452dd7 implement de_list 2016-04-17 12:43:09 +02:00
Jannes Höke
5cccf2603b reorder imports 2016-04-17 12:42:41 +02:00
Jannes Höke
185b080daa fix de_json 2016-04-17 12:42:30 +02:00
Jannes Höke
cb99341848 Update README.rst 2016-04-16 22:17:43 +02:00
Jannes Höke
1544f612ae remove cancel command 2016-04-16 21:11:41 +02:00
Jannes Höke
53d1d5f589 fix cancel command 2016-04-16 21:09:24 +02:00
Jannes Höke
6992a7a369 fix key error 2016-04-16 21:03:30 +02:00