Commit Graph

125 Commits

Author SHA1 Message Date
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
Alexander Babai
1232d6f378 methods classes: enable/dissable methods to builder style 2016-04-12 23:26:59 +03:00
Alexander Babai
79616210f4 objects classes: setters to builder style 2016-04-12 23:19:03 +03:00
Alexander Babai
0e36784cbe methods classes: setters to builder style 2016-04-12 22:25:54 +03:00
Ruben Bermudez
118ced4c6a Update README.md 2016-04-12 20:25:39 +02:00
Ruben Bermudez
402db3cfda Merge pull request #29 from rubenlagus/dev
Update version
2016-04-12 20:25:04 +02:00
Rubenlagu
301dc82d2e Update version 2016-04-12 20:23:48 +02:00
Ruben Bermudez
4034b6981a Merge pull request #28 from rubenlagus/dev
Merge #24
2016-04-12 20:16:56 +02:00
Rubenlagu
b9d997fddc Merge #24 2016-04-12 19:53:21 +02:00
Ruben Bermudez
3fd3da41ec Update README.md 2016-04-12 05:08:04 +02:00
Ruben Bermudez
9c244b91be Update README.md 2016-04-12 05:04:14 +02:00
Ruben Bermudez
9bb71cbbfa Merge pull request #26 from rubenlagus/dev
Bots API 2.0
2016-04-12 04:53:16 +02:00
Rubenlagus
0b73abad50 Bots API 2.0 2016-04-12 04:51:32 +02:00
Ruben Bermudez
2fb8cf40a5 Update README.md 2016-04-12 04:31:05 +02:00
Ruben Bermudez
c25367e2d6 Merge pull request #25 from rubenlagus/dev
Bots API 2.0
2016-04-12 04:28:28 +02:00
Rubenlagus
c587f83204 Bots API 2.0 2016-04-11 22:26:21 +02:00
Ruben Bermudez
684fbf609a Merge pull request #22 from a2mz/master
fix Class cast exception
2016-04-09 15:02:50 +02:00
morozov
bdb69445d4 fix Class cast exception 2016-04-07 15:36:13 +03:00
Ruben Bermudez
76a2f47408 Update README.md 2016-04-02 19:32:24 +02:00
Ruben Bermudez
7351def280 Merge pull request #20 from rubenlagus/dev
Merge to master
2016-04-02 19:06:07 +02:00
Rubenlagus
8f246c2306 Reformat 2016-04-02 18:54:00 +02:00
Rubenlagus
f9ef9cb117 Merge branch 'Clevero-correctly-process-returned-message-at-sendAudio' into dev 2016-04-02 18:52:30 +02:00
Rubenlagus
de141b50b0 Merge branch 'correctly-process-returned-message-at-sendAudio' of https://github.com/Clevero/TelegramBots into Clevero-correctly-process-returned-message-at-sendAudio 2016-04-02 18:52:08 +02:00
Rubenlagus
495b794687 Added Javadocs 2016-04-02 18:45:39 +02:00
Rubenlagus
d00df14aba Fix bug in ChosenInlineQuery
Added JAR sources
2016-04-02 18:45:04 +02:00
Rubenlagus
885791b927 Reformat and Rearrange 2016-04-02 18:20:49 +02:00
Rubenlagus
9f77b71742 Merge branch 'flicus-master' into dev 2016-04-02 18:17:38 +02:00
Rubenlagus
29aa2f58f7 Merge 2016-04-02 18:11:45 +02:00
Rubenlagus
ccfadfb910 Merge branch 'master' of https://github.com/flicus/TelegramBots into flicus-master 2016-04-02 18:05:41 +02:00
Ruben Bermudez
dcb58090a4 Merge pull request #18 from Clevero/add-api-method-getFile-to-AbsSender
add getFile to AbsSender in order to get the file path
2016-04-01 01:07:07 +02:00
Marcel Caspar
d30f77f6f2 add getFile to AbsSender in order to get the file path 2016-03-25 19:15:11 +01:00
Marcel Caspar
6ad4491136 revert changes in Message and remove useless if clause in AbsSender 2016-03-21 15:43:24 +01:00
schors
36e93a5fe3 proxy to the separate branch 2016-03-21 13:39:18 +03:00
schors
5bc595edc6 proxy to the separate branch 2016-03-21 13:38:12 +03:00