Commit Graph

531 Commits

Author SHA1 Message Date
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
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
Ruben Bermudez
fa4193617a
Update README.md 2018-06-21 16:41:16 +02:00
Ruben Bermudez
52d385fe86
Add files via upload 2018-06-21 16:22:34 +02:00
Lucas Oliveira
493568649a Spring Boot autoconfiguration improvements.
Unit test refactoring, now with autoconfiguration integration testing.
Bug fix that did not initialize the bots, even with the deprecated @EnableTelegramBots
* [Removed - If users wish to disable, just inform telegrambots.enabled = false].
Upgrade Spring boot 2.0.2
2018-06-09 15:06:38 -03:00
egorbochkarev
5f64fb90ed Support callback query 2018-06-08 23:12:34 +03:00
egorbochkarev
80d4a65c30 Add TelegramLongPollingSessionBot with session support 2018-06-07 20:43:41 +03:00
Abbas Abou Daya
e1e829151b Remove anonymous bot instantiation in ABs, refactor webhook functions 2018-06-04 04:47:21 -04:00
Ruben Bermudez
c4e13e25b3
Merge pull request #470 from addo37/enhance-db
Enhance DBContext with a single variable getter, pushes forward #425
2018-06-03 14:55:36 +02:00
Abbas Abou Daya
b5bfaced7e Separate AbilityBot logic and implement Webhook 2018-05-28 18:12:31 -04:00
Abbas Abou Daya
afebcaeb76 Fix javadoc 2018-05-27 04:20:04 -04:00
Abbas Abou Daya
714857555d Enhance DBContext with a single variable getter, pushes forward #425 2018-05-27 04:16:19 -04:00
Ruben Bermudez
ce1b0402ac
Merge pull request #466 from addo37/dev
Expose abilities and replies, add report command and reformat /commands, closes #436
2018-05-26 12:30:14 +02:00
Abbas Abou Daya
7bee69c68d Fix wiki doc and javadoc 2018-05-23 19:11:26 -04:00
Abbas Abou Daya
889fd46834 Expose abilities and replies, add report command and reformat /commands, closes #436 2018-05-23 18:59:03 -04:00
Ruben Bermudez
b0b2504e01
Merge pull request #449 from davioooh/abilities-i18n
Abilities i18n
2018-05-23 20:03:59 +02:00
Ruben Bermudez
05e65309d5
Merge pull request #464 from Chase22/dev
Added Documentation for deprecated methods
2018-05-23 20:02:07 +02:00
Chase
f78fd046e9 Added Documentation for deprecated methods 2018-05-23 09:17:45 +02:00
Abbas Abou Daya
7d216a1fae Fix todos, all ability bot messages are now properly localized 2018-05-22 03:12:47 -04:00
Abbas Abou Daya
a819d7f178 Cleanup and refactoring 2018-05-21 07:01:45 -04:00
Abbas Abou Daya
308aec54c2 Rebase on dev 2018-05-21 06:05:44 -04:00
Abbas Abou Daya
8729271d34 Fix tests 2018-05-21 05:57:43 -04:00
davioooh
9347d064c1 Refactor localized messages retrievement 2018-05-21 05:57:43 -04:00
davioooh
ab86947cc3 Fix issues
- export message codes
- standardize message codes
- format/spacing
2018-05-21 05:57:43 -04:00
davioooh
bd7092921a Remove locale retrieval to avoid exception 2018-05-21 05:57:43 -04:00
davioooh
aecfe7693a Add basic unit tests 2018-05-21 05:57:43 -04:00
davioooh
c8f1c69fb2 Complete externalization of messages 2018-05-21 05:57:43 -04:00
davioooh
7ff5be3a72 Refactor localized message helper method 2018-05-21 05:57:43 -04:00
davioooh
97a4c0031b Refactor EndUser to serialize locale 2018-05-21 05:57:43 -04:00
davioooh
45ea5af127 Update default messages 2018-05-21 05:57:43 -04:00
davioooh
d77887fd2c Add basic internationalization support 2018-05-21 05:57:43 -04:00
Abbas Abou Daya
c713f9da48 Fix tests 2018-05-18 04:40:27 -04:00
Ruben Bermudez
bcb9d7505b
Merge pull request #452 from addo37/dev
Fix group update check for GROUP_ADMIN
2018-05-17 18:37:22 +02:00