Jannes Höke
|
c0dd9c6ffc
|
always set webhook_url
|
2016-04-21 12:57:03 +02: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 |
|
Jannes Höke
|
a846c8fd86
|
Merge branch 'bot-api-2.0' into dispatcher-rework
|
2016-04-16 20:58:08 +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
|
90576de9e2
|
inline keyboard example works
|
2016-04-16 20:55:43 +02:00 |
|
Jannes Höke
|
79ca07f839
|
Merge branch 'bot-api-2.0' into dispatcher-rework
|
2016-04-16 20:33:36 +02:00 |
|
Jannes Höke
|
63c793aad4
|
initial example for inline keyboard
|
2016-04-16 20:32:44 +02:00 |
|
Jannes Höke
|
5e80efaa54
|
editMessage->editMessageText
|
2016-04-16 20:29:43 +02:00 |
|
Jannes Höke
|
a114f70249
|
fix callback query condition
|
2016-04-16 20:29:08 +02:00 |
|
Jannes Höke
|
31fba47829
|
fix super calls and module docs
|
2016-04-16 19:25:38 +02:00 |
|
Jannes Höke
|
360c3077ea
|
update examples
|
2016-04-16 19:25:08 +02:00 |
|
Jannes Höke
|
f2a92ccf46
|
Merge branch 'bot-api-2.0' into dispatcher-rework
|
2016-04-16 19:00:01 +02:00 |
|
Leandro Toledo
|
dd8f94885a
|
Commenting out deprecated arguments #232
|
2016-04-16 13:59:15 -03:00 |
|
Jannes Höke
|
06ec465c5f
|
Merge pull request #237 from tsnoam/master
request: catch socket.error
|
2016-04-16 18:49:21 +02:00 |
|
Leandro Toledo
|
79228b0655
|
Adds kwargs for InlineQueryResult objects #232
|
2016-04-16 13:49:16 -03:00 |
|
Jannes Höke
|
b2045717d6
|
Merge branch 'bot-api-2.0' into dispatcher-rework
|
2016-04-16 18:18:37 +02:00 |
|
Leandro Toledo
|
15cc410c10
|
Merge remote-tracking branch 'upstream/master' into bot-api-2.0
|
2016-04-16 13:16:49 -03:00 |
|
Leandro Toledo
|
f6524b0207
|
Adding InlineQueryResultCachedVoice #232
|
2016-04-16 13:10:30 -03:00 |
|
Noam Meltzer
|
ecc86d4bcd
|
request: catch socket.error
socket.error is another exception which is thrown by the underlying
infrastacture and not handled by the urllib2 or httplib layers
fixes #236
|
2016-04-16 19:09:45 +03:00 |
|
Leandro Toledo
|
56b17f2a17
|
Adding InlineQueryResultVoice #232
|
2016-04-16 13:05:55 -03:00 |
|
Leandro Toledo
|
8bf4a6fdda
|
Refactoring InlineQueryResultVideo #232
|
2016-04-16 13:01:26 -03:00 |
|
Leandro Toledo
|
109af62425
|
Adding InlineQueryResultVenue #232
|
2016-04-16 12:58:36 -03:00 |
|
Leandro Toledo
|
ec27edef58
|
Refactoring InlineQueryResultPhoto #232
|
2016-04-16 12:55:05 -03:00 |
|
Leandro Toledo
|
7231eaa349
|
Refactoring InlineQueryResultMpeg4Gif #232
|
2016-04-16 12:52:21 -03:00 |
|
Leandro Toledo
|
1876867ec7
|
Adding InlineQueryResultLocation #232
|
2016-04-16 12:49:07 -03:00 |
|
Leandro Toledo
|
17509fc24f
|
Refactoring InlineQueryResultGif #232
|
2016-04-16 12:46:24 -03:00 |
|
Leandro Toledo
|
2d2b269932
|
Adding InlineQueryResultDocument #232
|
2016-04-16 12:39:53 -03:00 |
|