Rubenlagus
1c1b302b52
Extract constant text plain content type
2016-06-09 22:31:14 +02:00
Rubenlagus
57634a1bc8
Merge branch 'antonu17-bugfix/multipart_reply_markup' into dev
2016-06-09 22:28:13 +02:00
antonu17
4b08b8ef7b
Set UTF-8 character set for reply_markup field in sendDocument(), sendPhoto(), sendVideo(), sendSticker(), sendAudio(), sendVoice() methods
2016-06-02 00:28:01 +06:00
Rubenlagus
56ac18e263
Fix ForwardMessage method
2016-06-01 02:06:35 +02:00
Rubenlagus
c9c2b0c187
Merge branch 'dev' of github.com:rubenlagus/TelegramBots into dev
2016-06-01 00:32:39 +02:00
Rubenlagus
e39e20c7f9
Remove setter for unmodificable fields in replymarkup
2016-06-01 00:32:14 +02:00
Ruben Bermudez
80ee84a367
Added new webhook sample
2016-05-31 22:09:41 +02:00
Ruben Bermudez
5b1130a788
Merge pull request #89 from Mit0x2/command_bot_additions
...
Command bot fixes
2016-05-31 21:58:04 +02:00
Timo Schulz
7047811eaa
change @author tag to full name + github username for reference
2016-05-31 20:01:50 +02:00
Timo Schulz
3a41c3fd5e
Add sender of the command to the execute method signature, to be able to do sth with it's data (e.g. userId)
2016-05-31 19:57:54 +02:00
Timo Schulz
01f321d917
remove commandbot example from readme
2016-05-31 19:53:06 +02:00
Timo Schulz
86f6e2785a
Merge branch 'dev' into command_bot_additions
2016-05-31 19:51:14 +02:00
Rubenlagus
e4b92fd0ad
Update Telegram api docs
2016-05-31 19:08:56 +02:00
tschulz
e068293059
Merge remote-tracking branch 'origin/command_bot_additions' into command_bot_additions
...
additions
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2016-05-31 11:20:35 +02:00
tschulz
0ff2e13f96
fix typo
2016-05-31 11:19:47 +02:00
tschulz
00a8ccfac6
fiy typo
2016-05-31 11:14:56 +02:00
tschulz
cc9cda3226
add example for command bot to readme
2016-05-31 11:13:28 +02:00
tschulz
d8abaec756
add javadoc (class purpose) for ICommandRegistry
2016-05-31 10:56:21 +02:00
tschulz
eefeb1e19f
remove empty constructor
2016-05-31 10:54:58 +02:00
tschulz
986608d7ad
add java doc for CommandRegistry -> class purpose
2016-05-31 10:54:40 +02:00
Rubenlagus
d1d8c74c98
Update version to 2.3.3.2
2016-05-31 01:09:24 +02:00
Rubenlagus
c8aaa91187
Fix RestApi
2016-05-30 20:25:36 +02:00
Rubenlagus
402b842a35
Closes #85
2016-05-29 03:59:39 +02:00
Rubenlagus
88ef2e6bf8
Merge branch 'dev' of github.com:rubenlagus/TelegramBots into dev
2016-05-27 15:06:33 +02:00
Rubenlagus
4270a529a0
Closes #84
2016-05-27 15:06:09 +02:00
Ruben Bermudez
b5eac76c68
Update .travis.yml
2016-05-27 14:25:19 +02:00
Rubenlagus
2825090112
Fix webhooks (unstable)
2016-05-27 14:11:11 +02:00
Rubenlagus
b07bf5531b
Clean up, update pom file
2016-05-27 04:43:13 +02:00
Rubenlagus
1100ad11e4
Changes on #83
2016-05-27 03:19:17 +02:00
Rubenlagus
fbc495f6f0
Merge branch 'Mit0x2-implement_command_mechanism' into dev
2016-05-27 02:13:27 +02:00
Rubenlagus
480f9a6907
Merge branch 'implement_command_mechanism' of https://github.com/Mit0x2/TelegramBots into Mit0x2-implement_command_mechanism
2016-05-27 02:12:59 +02:00
Rubenlagus
ce9d198d5c
Merges #82
2016-05-27 02:04:21 +02:00
Timo Schulz
66566e3a65
make command bot extend TelegramLongPollingBot
2016-05-26 09:24:10 +02:00
Ruben Bermudez
94e4d4397b
Update README.md
2016-05-25 19:33:15 +02:00
Timo Schulz
6daf18f007
fix BotLogger import
2016-05-25 18:08:10 +02:00
Timo Schulz
31c9cdfaf7
Merge branch 'dev' into implement_command_mechanism
2016-05-25 18:00:10 +02:00
Ruben Bermudez
b8a019436e
Update .travis.yml
2016-05-25 02:47:10 +02:00
Ruben Bermudez
cf78dcfcbe
Update .travis.yml
2016-05-25 01:33:56 +02:00
Ruben Bermudez
95801105d5
Create .travis.yml
2016-05-25 01:28:08 +02:00
Ruben Bermudez
020949904b
Merge pull request #81 from Mit0x2/gitignore_file_update
...
Gitignore file update
2016-05-25 01:15:19 +02:00
Timo Schulz
ea339c08e6
remove .DS_STORE files from tracking
2016-05-22 14:37:30 +02:00
Timo Schulz
e60e50a9c5
teach git to ignore .DS_STORE files
2016-05-22 14:33:35 +02:00
Timo Schulz
9c5d7ec9e6
Merge remote-tracking branch 'upstream/master'
2016-05-22 14:18:48 +02:00
Timo Schulz
f33b9fa10e
remove AbsSender field for command and instead reach it in on each execute call -> so one command could be reached to multiple bot in parallel
2016-05-22 14:10:57 +02:00
Ruben Bermudez
c0262ceda0
Merge pull request #79 from rubenlagus/dev
...
Bug fix
2016-05-22 12:14:15 +02:00
Rubenlagus
0584416773
Bug fix
2016-05-22 12:13:18 +02:00
Ruben Bermudez
a7894f29e2
Merge pull request #78 from rubenlagus/dev
...
Dev
2016-05-22 11:51:32 +02:00
Rubenlagus
f923a978df
New version
...
Closes #72
2016-05-22 11:50:31 +02:00
Rubenlagus
fc553401a6
Merge branch 'antonu17-sendphoto_caption_fix' into dev
2016-05-22 11:47:33 +02:00
Rubenlagus
0b6f4e1d06
Support Telegram Bots API 2.1
2016-05-22 11:42:04 +02:00
