Commit Graph

208 Commits

Author SHA1 Message Date
Ruben Bermudez
241afa0630 Merge pull request #68 from rubenlagus/dev
Dev
2016-05-05 22:51:28 +02:00
Rubenlagus
587b730e47 Merge branch 'remove_ide_files' of https://github.com/antonu17/TelegramBots into dev 2016-05-05 22:43:53 +02:00
Ruben Bermudez
96ca92d703 Merge pull request #67 from rubenlagus/dev
Upgrade version to 2.3
2016-05-05 22:42:04 +02:00
Rubenlagus
a343801315 Upgrade version to 2.3 2016-05-05 22:41:22 +02:00
Ruben Bermudez
e0076ebf8b Merge pull request #66 from rubenlagus/dev
Dev
2016-05-05 22:40:44 +02:00
Rubenlagus
160a2fa3ba Upgrade version to 2.3 2016-05-05 21:50:55 +02:00
Rubenlagus
f92a4616b1 Merge branch 'antonu17-fix_response_creation' into dev 2016-05-05 21:25:17 +02:00
Rubenlagus
0ead56bac7 Merge branch 'antonu17-contact_getters' into dev 2016-05-05 21:22:35 +02:00
kit
4f427ba5d8 Fix response processing on methods: sendDocument sendPhoto sendVideo sendSticker sendVoice 2016-05-02 12:32:01 +06:00
kit
7f9e4494e7 Add Contact getters 2016-05-02 12:21:41 +06:00
kit
409cf9f05a Remove IDE files 2016-05-02 12:17:18 +06:00
Ruben Bermudez
0d86836e14 Merge pull request #61 from rubenlagus/dev
Fix toString method
2016-05-01 23:03:08 +02:00
Rubenlagus
66c6c5257d Fix toString method 2016-05-01 23:02:22 +02:00
Ruben Bermudez
38d3a046ff Merge pull request #60 from rubenlagus/dev
Added logger
2016-05-01 22:55:33 +02:00
Rubenlagus
b2c09a902d Added logger 2016-05-01 22:44:22 +02:00
Ruben Bermudez
aee15fffb5 Merge pull request #55 from rubenlagus/dev
Fix compile bug
2016-04-29 14:28:17 +02:00
Rubenlagus
1f1cdf5d18 Fix compile bug 2016-04-29 14:27:09 +02:00
Ruben Bermudez
52ba1afad8 Merge pull request #52 from camilosampedro/patch-1
Changed the json cahed object class to Sticker
2016-04-29 12:23:24 +02:00
Ruben Bermudez
08a2cca78c Merge pull request #54 from rubenlagus/dev
Add global exception catch with sleep time
2016-04-29 12:19:48 +02:00
Ruben Bermudez
017c4b2b1d Add global exception catch with sleep time 2016-04-28 09:15:11 +02:00
Camilo A. Sampedro Restrepo
dc23b47b23 Changed the json cahed object class to Sticker
It was generating a `InlineQueryResultCachedGif` instead of `InlineQueryResultCachedSticker`, producing a wrong behavior.
2016-04-24 22:20:42 -05:00
Ruben Bermudez
fa39987a47 Merge pull request #45 from rubenlagus/dev
Fix venue problem and add info to exception toString
2016-04-22 15:20:34 +02:00
Rubenlagus
ffa98c5928 Closes #44
Closes #9
2016-04-22 15:19:44 +02:00
Ruben Bermudez
56a0cf985e Merge pull request #43 from rubenlagus/dev
Support editing messagess sent "via bot" upon editing
2016-04-21 22:37:23 +02:00
Rubenlagus
6431adfe87 Support editing messagess sent "via bot" upon editing, an empty message is returned if successful 2016-04-21 22:36:30 +02:00
Ruben Bermudez
98acc55e3c Merge pull request #42 from rubenlagus/dev
Fix CallbackQuery bug
2016-04-21 21:30:04 +02:00
Rubenlagus
a601e983ec Fix CallbackQuery bug 2016-04-21 21:29:17 +02:00
Ruben Bermudez
f2e569830d Merge pull request #40 from rubenlagus/dev
Dev
2016-04-20 19:48:46 +02:00
Rubenlagus
aeed4ef639 Merge #39 2016-04-20 19:48:02 +02:00
Rubenlagus
2a5bd25532 Merge branch 'tolwi-fix_inline_response' into dev 2016-04-20 19:45:56 +02:00
tolwi
85e3d74f47 fix_inline_response 2016-04-19 13:14:54 +03:00
Ruben Bermudez
3f2c0e2951 Merge pull request #38 from rubenlagus/dev
Merge Dev
2016-04-17 17:44:24 +02:00
Rubenlagus
fbae7311b8 Merge branch 'Pixelase-dev' into dev 2016-04-17 17:39:27 +02:00
Rubenlagus
bd83fe78cc Update version 2016-04-17 17:37:27 +02:00
Rubenlagus
1ba0502c4c Merge #30 2016-04-17 17:35:48 +02:00
Rubenlagus
08efa94fcd Merge #30 and some fixes 2016-04-17 17:34:38 +02:00
Rubenlagus
1c66511bff Add compatibility with java7
Merge #21
2016-04-17 17:10:09 +02:00
Rubenlagus
a84f073a0a Remove unneeded constructure
Merge #31
2016-04-17 17:07:13 +02:00
Rubenlagus
c1a0b25c9c Merge branch 'TerminusMKB-master' into dev 2016-04-17 16:56:54 +02:00
Rubenlagus
fe5336034a Renamed ignored exception
Merge #37
2016-04-17 16:54:08 +02:00
Rubenlagus
a5cae5ac35 Merge branch 'Vinpasso-master' into dev 2016-04-17 16:47:22 +02:00
Rubenlagus
cbe5613549 Fix error in pull requests
Merge #36
2016-04-17 16:43:27 +02:00
Rubenlagus
3c96f765c3 Merge branch 'michaelarlt-patch-1' into dev 2016-04-17 16:37:41 +02:00
Vinpasso
3df8631a6d Closeable Bot Sessions
Return a Bot Session Class when registering a Bot that can be closed as
needed
Give Threads a default Name to distinguish them in Debug Mode
2016-04-17 15:50:54 +02:00
Michael Arlt
28c2f3336b fixed types integer and string
sorry, did mess up
2016-04-17 15:41:36 +02:00
Michael Arlt
9275f91b02 adding missing values 2016-04-17 15:33:41 +02:00
TerminusMKB
bd9c66fec4 Added getters and setters to AnswerCallbackQuery
Added getters to CallbackQuery
InlineKeyboardMarkup is fixed and refactored
2016-04-14 14:23:59 +03:00
Alexander Babai
62f9e49201 Message move back some methods 2016-04-12 23:53:44 +03:00
Alexander Babai
cf91e024ca TelegramBotsApi methods to builder style 2016-04-12 23:35:33 +03:00
Alexander Babai
94ea153a18 objects classes: enable/dissable methods to builder style 2016-04-12 23:31:14 +03:00