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

662 Commits

Author SHA1 Message Date
Ruben Bermudez bdc8db3c87
Merge pull request #528 from d35h/master 
Add addAll method for keyboardrow class
 2018-10-31 20:14:34 +00:00
Ruben Bermudez 2c24058d5e
Merge pull request #526 from Chase22/master 
Created Page on how to use Enviroment Variables for Tokens
 2018-10-31 20:13:30 +00:00
Ruben Bermudez ea6345b26f
Merge pull request #529 from Clevero/dev 
change deprecated URL to MonsterDeveloper's book
 2018-10-31 20:12:56 +00:00
Ruben Bermudez 7c33c8f454
Merge pull request #533 from Saberos/dev 
Update Wiki FAQ Spring Boot starter
 2018-10-31 20:12:35 +00:00
Ruben Bermudez 698a9eec76
Merge pull request #530 from Clevero/master 
add example for ChatActions to FAQ
 2018-10-31 20:12:15 +00:00
Stephan Groenewold 60d5634938 Update Wiki FAQ Spring Boot starter 2018-10-24 16:46:41 +02:00
Clevero 87fdde7fe1
Update FAQ.md 2018-10-17 09:54:24 +02:00
Clevero 4a244ce4da
change deprecated URL to MonsterDeveloper's book 
The URL https://legacy.gitbook.com/book/monsterdeveloper/writing-telegram-bots-on-java/details seems to be deprecated

https://monsterdeveloper.gitbooks.io/writing-telegram-bots-on-java/content/
 2018-10-17 08:56:39 +02:00
d35h dc62f9ce63 Add tests 2018-10-14 22:11:04 +02:00
d35h 4efaa253b8 Add addAll method for keyboardrow 2018-10-14 21:45:49 +02:00
Ruben Bermudez b4f710beaf
Merge pull request #524 from ezachateyskiy/patch-1 
Fix wrong path for SendAnimation command
 2018-09-28 22:33:23 +01:00
chase 77a3c635b5 Revert: Fix headers in Handling Bot Tokens page 2018-09-28 23:29:08 +02:00
chase d7c5d28d45 Fix headers in Handling Bot Tokens page again 2018-09-28 22:14:00 +02:00
chase 8aa77f54eb Fix headers in Handling Bot Tokens page 2018-09-28 22:11:33 +02:00
chase ce82e627a6 Created page on how to handle bot tokens 2018-09-28 22:09:48 +02:00
ezachateyskiy 584b9d5f98
Fix wrong path for SendAnimation command 2018-09-15 02:07:17 +03:00
Ruben Bermudez 6cb8b7905d
Merge pull request #519 from davyvanroy/patch-1 
typo
 2018-09-09 12:13:36 +01:00
Ruben Bermudez ffc1f713dc
Merge pull request #518 from rubenlagus/dev 
Dev
 2018-08-30 19:29:25 +01:00
Davy Van Roy 1728a23b00
typo 2018-08-30 14:31:26 +02:00
Ruben Bermudez 01d3de4945 Update changelog 2018-08-29 21:36:11 +01:00
Ruben Bermudez a4b7abce78 Update changelog 2018-08-21 21:29:33 +01:00
Ruben Bermudez f415afb568 #Fix 507 2018-08-21 21:27:54 +01:00
Ruben Bermudez 3e5f12a4c4 Fix #512 2018-08-21 21:19:31 +01:00
Ruben Bermudez 7f8df47f0b Update version 4.1 2018-08-21 20:59:55 +01:00
Ruben Bermudez 27e0751b7e
Merge pull request #503 from rubenlagus/dev 
Dev
 2018-08-09 02:58:31 +02:00
Ruben Bermudez b0bc5ea5b7 Update wiki 2018-08-09 02:51:41 +02:00
Ruben Bermudez e52b7c48a7 Update version 2018-08-09 02:50:04 +02:00
Ruben Bermudez 2bc07613bb Closes #499 2018-08-09 02:49:48 +02:00
Ruben Bermudez 996a11064b Update changelog 2018-08-09 02:49:48 +02:00
Ruben Bermudez df1cf5a43b
Merge pull request #497 from Clevero/patch-4 
Update library version for gradle to 4.0
 2018-07-27 20:18:48 +02:00
Clevero 542a93015f
Update library version for gradle to 4.0 
Don't using gradle, so don't have tested if it's already available there
Just saw it while looking through
 2018-07-27 18:16:42 +02:00
Ruben Bermudez 01765d07a8
Merge pull request #496 from rubenlagus/dev 
Dev
 2018-07-27 01:52:02 +02:00
Ruben Bermudez ed1df4402b Merge branch 'addo37-webhook' into dev 2018-07-27 01:06:31 +02:00
Ruben Bermudez 4ea716cfea Merge branch 'webhook' of https://github.com/addo37/TelegramBots into addo37-webhook 
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java
 2018-07-27 01:06:23 +02:00
Ruben Bermudez 7daebe1318 Merge branch 'webhook' of https://github.com/addo37/TelegramBots into addo37-webhook 
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java
 2018-07-27 01:04:51 +02:00
Ruben Bermudez 904dc39a97 Fix docs 2018-07-27 00:51:45 +02:00
Ruben Bermudez 777da2eccd Merge branch 'EgorBochkarev-dev' into dev 2018-07-27 00:49:02 +02:00
Ruben Bermudez 1c1f340dc9 Update to version 4.0.0 2018-07-27 00:48:40 +02:00
Ruben Bermudez fe10bc8c03 Merge branch 'dev' of https://github.com/EgorBochkarev/TelegramBots into EgorBochkarev-dev 2018-07-27 00:37:32 +02:00
Ruben Bermudez a75ca5f08d Version 4.0.0 2018-07-27 00:27:26 +02:00
Ruben Bermudez 6c24155bdf
Merge pull request #491 from ChmilevFA/java9-support 
Java9+ support
 2018-07-26 20:01:22 +02:00
chmilevfa 753d1d2ed8 Fixes after merge 2018-07-16 19:54:26 +02:00
chmilevfa 0357fdb137 Properly update version to 3.6.2 2018-07-16 19:43:45 +02:00
chmilevfa ad3dbfdd58 Merge branch 'dev' into java9-support 
# Conflicts:
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java
#	telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java
#	telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java
#	telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java
 2018-07-16 19:37:30 +02:00
Chmliev Fedor 036032a39c
Merge pull request #1 from rubenlagus/dev 
Dev
 2018-07-16 18:53:26 +02:00
Ruben Bermudez dd5d14df6c
Merge pull request #451 from AzZureman/proxy-feature 
Socks proxy feature
 2018-07-16 13:28:44 +03:00
Ruben Bermudez 1356a27e1d
Merge pull request #486 from rubenlagus/rubenlagus-jetbrains 
Rubenlagus jetbrains
 2018-07-16 13:20:39 +03:00
Ruben Bermudez 1e90c0c0e4
Merge pull request #477 from luksrn/spring_boot_starter_fix_and_improving 
Spring Boot autoconfiguration improvements.
 2018-07-16 13:18:53 +03:00
chmilevfa c0b903e689 telegrambots-extensions java 9 supported 2018-07-08 01:46:26 +02:00
chmilevfa db9ae4f586 telegrambots-meta java 9 supported 2018-07-08 01:41:21 +02:00