Commits · fe4c545516fb7bf7e7322850484a11ec5196f370 · Kulya / TelegramBot

26 May, 2016 3 commits
- Merge pull request #202 from jacklul/quickupdate · fe4c5455
  Jack'lul authored May 26, 2016
```
Quick updates
```
  fe4c5455
- Merge branch 'develop' into quickupdate · 0fcd30a8
  Jack'lul authored May 26, 2016
```
# Conflicts:
#	src/DB.php
#	structure.sql
```
  0fcd30a8
- Merge pull request #198 from jacklul/apiupdate · 1549a4fd
  Jack'lul authored May 26, 2016
```
API 2.1
```
  1549a4fd
25 May, 2016 4 commits
- update comment · f1120ea2
  Jack'lul authored May 25, 2016
  
  f1120ea2
- fix when using getUpdates · 6850f618
  Jack'lul authored May 25, 2016
  
  6850f618
- another fix for botan · 202d8d75
  Jack'lul authored May 25, 2016
  
  202d8d75
- Merge branch 'develop' into apiupdate · dbeb0d84
  Jack'lul authored May 25, 2016
```
# Conflicts:
#	src/DB.php
#	structure.sql
```
  dbeb0d84
24 May, 2016 4 commits
- fix for '/' message · 4fd2d0a7
  Jack'lul authored May 24, 2016
  
  4fd2d0a7
- isAdmin with EditedMessage, reordered · cedf965c
  Jack'lul authored May 24, 2016
  
  cedf965c
- improve db structure and DB.php · 096251a4
  Jack'lul authored May 24, 2016
  
  096251a4
- botan integration fixes · 0cd6a07b
  Jack'lul authored May 24, 2016
  
  0cd6a07b
23 May, 2016 7 commits
- Merge pull request #189 from jacklul/dbchanges · 52e1ef1e
  Marco Boretto authored May 23, 2016
```
chosen_inline_result table and make utf8mb4 default
```
  52e1ef1e
- Merge pull request #3 from MBoretto/conflict · 15afa620
  Jack'lul authored May 23, 2016
```
Conflict
```
  15afa620
- resolve botan conflict · 307c4cea
  MBoretto authored May 23, 2016
  
  307c4cea
- fix creation order · 4854b66d
  Jack'lul authored May 23, 2016
  
  4854b66d
- fix for getUpdates · 8c66ba4e
  Jack'lul authored May 23, 2016
  
  8c66ba4e
- fix · 9889ef19
  Jack'lul authored May 23, 2016
  
  9889ef19
- implement responses for API 2.1 · 3dd1b671
  Jack'lul authored May 23, 2016
  
  3dd1b671
22 May, 2016 3 commits
- fix constraint · cbc9dd05
  Jack'lul authored May 22, 2016
  
  cbc9dd05
- correction · 96a6253f
  Jack'lul authored May 22, 2016
  
  96a6253f
- apply main API 2.1 changes · 379038e5
  Jack'lul authored May 22, 2016
  
  379038e5
21 May, 2016 3 commits
- botan.io integration instructions · abd1c227
  Jack'lul authored May 21, 2016
  
  abd1c227
- curl handler always closed correctly · 308d451f
  MBoretto authored May 21, 2016
  
  308d451f
- make sure the message begins with a command · b2ad7c67
  Jack'lul authored May 21, 2016
  
  b2ad7c67
20 May, 2016 2 commits
- this will be useful when botan api will be under heavy load · 738f6756
  Jack'lul authored May 20, 2016
  
  738f6756
- introduce botan.io integration · 771a5061
  Jack'lul authored May 20, 2016
  
  771a5061
19 May, 2016 5 commits
- Merge pull request #2 from MBoretto/520_fix · 09d4337e
  Jack'lul authored May 19, 2016
```
mysql travis fix
```
  09d4337e
- mysql travis fix · 0c11ef6c
  MBoretto authored May 19, 2016
  
  0c11ef6c
- Merge pull request #1 from MBoretto/520_fix · bef7d9a1
  Jack'lul authored May 19, 2016
```
travis fix
```
  bef7d9a1
- travis fix · da9cf848
  MBoretto authored May 19, 2016
  
  da9cf848
- remove these comments (Entity.php handles this) · c87ae13e
  Jack'lul authored May 19, 2016
  
  c87ae13e
18 May, 2016 9 commits
- this should fix 'Invalid argument supplied for foreach()' error · 9690c3f6
  Jack'lul authored May 18, 2016
  
  9690c3f6
- adjust for new Entity.php · 72ffc486
  Jack'lul authored May 18, 2016
  
  72ffc486
- fix mistakes · 4ed4395c
  Jack'lul authored May 18, 2016
  
  4ed4395c
- Merge branch 'develop' of https://github.com/akalongman/php-telegram-bot into develop · 193aa44c
  MBoretto authored May 18, 2016
  
  193aa44c
- adding example for Inline keyboard · 7147b12f
  MBoretto authored May 18, 2016
  
  7147b12f
- switch to utf8mb4_unicode_520_ci collation · 56bfd1f9
  Jack'lul authored May 18, 2016
  
  56bfd1f9
- Update CREDITS · 2bdd0d12
  Jack'lul authored May 18, 2016
  
  2bdd0d12
- update isAdmin() · 00f719a4
  Jack'lul authored May 18, 2016
  
  00f719a4
- Merge pull request #190 from jacklul/fix · 61d6c755
  Jack'lul authored May 18, 2016
```
Quick Fix
```
  61d6c755