128 commits

Author	SHA1	Message	Date
leandrotoledo	bbbc622517	Adds @message decorator to editMessageText #320	2016-06-03 13:28:29 -04:00
Noam Meltzer	7e7acdeb23	set default network_delay to 5 seconds ... fixes #309	2016-05-28 19:34:16 +03:00
Leandro Toledo	9a13de4a96	Merge remote-tracking branch 'origin/master' into bot2.1 ... Conflicts: telegram/bot.py tests/test_bot.py	2016-05-26 16:15:50 -03:00
Noam Meltzer	561f1c3f02	bot: validate token does not contain white spaces (#306) ... in addition move validation code from validate.py into bot.py and delete the former file	2016-05-26 22:09:14 +03:00
Rahiel Kasim	1abbca3324	bot.py: fix snake_case alias	2016-05-26 15:32:02 +02:00
Leandro Toledo	37c7af2e14	Add docstrings #302	2016-05-25 21:41:12 -03:00
Leandro Toledo	ab2f6e13c9	Add kwargs to API calls #302	2016-05-23 20:43:17 -03:00
Leandro Toledo	d7e226ec0f	Add new Bot methods and ChatMember class #302	2016-05-23 20:22:31 -03:00
Leandro Toledo	49122d6a99	Remove \ from base code #259	2016-05-14 23:26:56 -03:00
Leandro Toledo	d445d35ceb	Running yapf for codebase #259	2016-05-14 22:46:40 -03:00
Rahiel Kasim	6e9f30ca6e	fix merge conflict snakes	2016-05-02 16:37:45 +02:00
Djaler	4b0be65a76	Fix Bot.getUpdates() docstring	2016-05-01 15:25:07 +03:00
Rahiel Kasim	5971cb35f8	fix merge conflict snakes with master	2016-04-30 14:56:48 +02:00
Jannes Höke	d940afa718	merge master into cr4.0	2016-04-29 18:37:41 +02:00
Rahiel Kasim	ec15e866be	add snake_case aliases for CamelCase methods	2016-04-28 12:20:42 +02:00
Noam Meltzer	0c74b3cfb9	bot.py + request.py: network_delay is unique for getUpdates	2016-04-28 01:41:32 +03:00
Jannes Höke	7f463131aa	re-order imports	2016-04-27 00:28:21 +02:00
Noam Meltzer	a686db2c6f	bot.Bot: fix class docstring	2016-04-26 23:31:29 +03:00
leandrotoledo	1f29093027	Merge branch 'unittest-bot2.0' of https://github.com/python-telegram-bot/python-telegram-bot into unittest-bot2.0	2016-04-26 14:17:59 -03:00
Noam Meltzer	49385493f4	bot: 'if X is not None' is cleaner approach	2016-04-26 17:47:37 +03:00
Leandro Toledo	fc7c161018	Merge remote-tracking branch 'origin/master' into unittest-bot2.0	2016-04-24 14:33:17 -03:00
Andrea Giove	39ba575a4d	Missing a comma	2016-04-24 17:54:36 +02:00
Andrea Giove	87ac962805	Added caption paramenter to sendDocument method	2016-04-24 17:51:15 +02:00
Leandro Toledo	14cb13acfd	Adds @message decorator to editMessageText	2016-04-24 11:19:37 -03:00
Leandro Toledo	4ecb4911db	Adds @message decorator to editMessageText	2016-04-24 11:18:16 -03:00
Leandro Toledo	adc3104214	Add timeout and network_delay kwargs to all bot methods.	2016-04-24 10:06:59 -03:00
Leandro Toledo	b444cd7bce	Adding new modules to docs #232	2016-04-22 11:07:44 -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	5315e072cb	PEP8 for Py2 #232	2016-04-21 11:59:18 -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
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
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	a98919a86e	fix cache_time==0 case	2016-04-19 00:08:47 +02:00
Jannes Höke	d879a0d018	convert reply_markup to json	2016-04-17 22:11:29 +02:00
Jannes Höke	0e5129e59f	fix method names and parameters for new methods	2016-04-16 20:57:50 +02:00
Jannes Höke	5e80efaa54	editMessage->editMessageText	2016-04-16 20:29:43 +02:00
Leandro Toledo	85f1b1af0c	Adding sendContact and sendVenue methods #232	2016-04-16 11:48:36 -03:00
Leandro Toledo	60f9aede07	Minor fix on answerInlineQuery #232	2016-04-14 02:38:51 -03:00
Leandro Toledo	c411ef7822	Adding switch_pm_text and switch_pm_parameter to answerInlineQuery #232	2016-04-14 02:34:29 -03:00
Leandro Toledo	429ea92254	Adding KeyboardButton #232	2016-04-14 02:01:05 -03:00
Leandro Toledo	751402a0d3	Adding new Bot methods editMessageText, editMessageCaption, editMessageReplyMarkup #232	2016-04-14 00:28:06 -03:00
Leandro Toledo	2af15cadd6	New method answerCallbackQuery #232	2016-04-13 21:25:26 -03:00
Leandro Toledo	736d62e20d	New methods kickChatMember and unbanChatMember #232	2016-04-12 00:46:50 -03:00
Leandro Toledo	1e4ae6546f	Changing INFO logs to DEBUG and minor fixes	2016-03-14 22:56:20 -03:00
Aydar Biktimirov	dc9b77e02c	Merge remote-tracking branch 'upstream/master'	2016-03-11 23:03:13 +03:00
Rahiel Kasim	5958da0031	bot.sendMessage: update documentation	2016-03-11 20:32:10 +01:00
Aydar Biktimirov	433110abe9	Added disable_notification parameter for silent messages	2016-03-09 18:47:33 +03:00
Jannes Höke	4aca4d1d1f	Merge pull request #187 from python-telegram-bot/flaky-tests ... Flaky tests	2016-02-28 01:02:11 +01:00