andreacavalli/TelegramBots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
227 Commits 5 Branches 74 Tags 3.2 MiB
d4dc470706
Commit Graph

227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubenlagus
d4dc470706 reformat 2016-07-13 20:23:38 +02:00
Rubenlagus
bcb43bf165 Merge branch 'd2a-raudenaerde-master' into dev 2016-07-13 20:20:26 +02:00
Ruben Bermudez
5c240c4d13 Merge pull request #111 from Sheigutn/fix-typos 
Fixed a few copy-paste mistakes
 2016-07-13 20:16:05 +02:00
Ruben Bermudez
3b28c4702e Merge pull request #109 from valery1707/patch-1 
Fix typo in README
 2016-07-13 20:15:17 +02:00
Sheigutn
e75a28f518 Fixed a few copy-paste mistakes in toString() methods & fixed functionality of GetChatMember and GetChatMemberCount 2016-07-13 10:04:44 +02:00
valery1707
ee13d92044 Fix typo in README 2016-07-10 23:44:21 +06:00
d2a-raudenaerde
1a77291d5b Shading http components 2016-06-29 17:59:35 +02:00
Ruben Bermudez
f9ab74d407 Merge pull request #101 from rubenlagus/dev 
Update version v2.3.3.4
 2016-06-26 19:48:10 +02:00
Rubenlagus
d39f874ceb Update version 2.3.3.4 2016-06-26 19:44:17 +02:00
Ruben Bermudez
d1f1f7fb2a Merge pull request #98 from BjoernPetersen/gitignore_improvement 
Gitignore improvements
 2016-06-26 19:39:26 +02:00
Ruben Bermudez
e911314925 Merge pull request #99 from BjoernPetersen/fix_replay_typo 
Fix replay/reply typo and deprecate old methods. Fixes #97
 2016-06-26 19:39:05 +02:00
Rubenlagus
1dc99b9358 Merge branch 'dev' of github.com:rubenlagus/TelegramBots into dev 2016-06-20 21:33:35 +02:00
Rubenlagus
046d918574 Use enum for Actions types 2016-06-20 21:33:14 +02:00
Björn Petersen
c314b5a875 Add new line at end of .gitignore 2016-06-20 20:52:14 +02:00
Björn Petersen
68cda72ece Fix replay/reply typo and deprecate old methods. Fixes #97 2016-06-20 20:50:03 +02:00
Björn Petersen
5880114604 Add eclipse files to .gitignore 2016-06-20 20:16:17 +02:00
Ruben Bermudez
9378ce80ae Merge pull request #96 from rubenlagus/dev 
Update README.md
 2016-06-10 12:17:54 +02:00
Ruben Bermudez
04a2b6978b Update README.md 2016-06-10 12:17:31 +02:00
Ruben Bermudez
0b114aefe2 Merge pull request #94 from rubenlagus/dev 
v2.3.3.3
 2016-06-09 23:20:40 +02:00
Rubenlagus
4fc3cc34cf Update version v2.3.3.3 2016-06-09 23:04:08 +02:00
Rubenlagus
ef66e35827 Document deprecated methods 2016-06-09 22:52:08 +02:00
Rubenlagus
d8c2a1a22a Merge branch 'antonu17-feature/improve_send_newfile' into dev 2016-06-09 22:32:34 +02:00
Rubenlagus
df985fc276 Merge branch 'feature/improve_send_newfile' of https://github.com/antonu17/TelegramBots into antonu17-feature/improve_send_newfile 2016-06-09 22:32:11 +02:00
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
5108087144 Change send methods, add using InputStream 2016-06-04 10:17:00 +06:00
antonu17
65d82076c2 Deprecate old methods, overload setNew... methods with InputStream arguments 2016-06-04 10:15:55 +06:00
antonu17
7b6a376976 Change MultipartEntityBuilder.addBinaryBody() function 2016-06-03 23:22:13 +06:00
antonu17
ee12175eea Change sendNew methods signature, now accepting File 2016-06-03 23:22:02 +06: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
Ruben Bermudez
946b5438ad Merge pull request #86 from rubenlagus/dev 
Update v2.3.3.2
 2016-05-31 01:15:57 +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