Merge branch 'resolve-conflict' into tests/telegram-bot-api
Description
Description
Details
Details
- Provenance
Monster3D Authored on Sep 30 2016, 10:22 PM - Parents
- R123:ac570091d9d8: Merge pull request #303 from noplanman/ext-mbstring_dependency
R123:ad6fe4c7fa63: Correcting grammatical errors - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- b4713f3b5b31 Fix constraint error reported by @jacklulAuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- 005f781e241e Added PHP version badgeAuthorAvtandil Kikabidze
- 576d6907b779 Small typos and comment corrections.AuthorArmando Lüscher
- 58e5ec296229 Simplify isAdmin method.AuthorArmando Lüscher
- 37efce68fef3 Minor fixes.AuthorArmando Lüscher
- e9be41ef35ed Various little code and comment updates.AuthorArmando Lüscher
- f1909df0047d Refactor JSON entities array string generation.AuthorArmando Lüscher
- dae16857f19a Tidy up selectChats method.AuthorArmando Lüscher
- b1cceae8b832 Tidy up insertEditedMessageRequest method.AuthorArmando Lüscher
- da0dd39cbb59 Tidy up insertMessageRequest method.AuthorArmando Lüscher
- 3d50e036dcc6 Tidy up insertCallbackQueryRequest method.AuthorArmando Lüscher
- f5da36581667 Tidy up insertChosenInlineResultRequest method.AuthorArmando Lüscher
- c2975bacdb75 Tidy up insertInlineQueryRequest method.AuthorArmando Lüscher
- d936c86f477a Tidy up insertChat method.AuthorArmando Lüscher
- d9f6e56c743d Tidy up insertUser method.AuthorArmando Lüscher
- 3b7ddbc8e4bf Tidy up insertRequest method.AuthorArmando Lüscher
- b2e6005b9f17 Tidy up insertTelegramUpdate method.AuthorArmando Lüscher
- b8752f08681e DRY up getTimestamp method.AuthorArmando Lüscher
- e0af927916e0 Tidy up selectMessages method.AuthorArmando Lüscher
- b814a923981f Tidy up selectTelegramUpdate method.AuthorArmando Lüscher
- f28f9b02fbb4 Simplify defineTables method.AuthorArmando Lüscher
- AuthorArmando Lüscher
- 096bd751e139 Make downloadFile method more robust.AuthorArmando Lüscher
- 51318946e4ef Optimise method to set up request params.AuthorArmando Lüscher
- AuthorArmando Lüscher
- AuthorArmando Lüscher
- ba90f121b814 A few code optimisations.AuthorArmando Lüscher
- 98722812991d Various smaller code and DocBlock fixes.AuthorArmando Lüscher
- 38becee69343 Smaller refactorings and DocBlock adjustments.AuthorArmando Lüscher
- 12f46a2bc6b7 Refactor by extracting duplicate code into methods.AuthorArmando Lüscher
- 532208d7c4a2 Fix phpcs error.AuthorArmando Lüscher
- 703bce70d000 Various minor DocBlock corrections.AuthorArmando Lüscher
- 2724f7937d49 Minor style corrections.AuthorArmando Lüscher
- 0d04d66ae6c4 Fix and improve User commands.AuthorArmando Lüscher
- c9e38bc55bcf Fix and improve System commands.AuthorArmando Lüscher
- e67d9b7322fc Fix and improve Admin commands.AuthorArmando Lüscher
- 68874bb760b1 Fix Botan related files.AuthorArmando Lüscher
- 9966f3ec23d3 Fix example commands.AuthorArmando Lüscher
- ae619a1bbdd2 Changed branch name for scrutinizerAuthorAvtandil Kikabidze
- b9b630a0f7f9 Improvements in travis v.2AuthorAvtandil Kikabidze
- 55033c6a700b Improvements in travisAuthorAvtandil Kikabidze
- 36787d67c916 Improved code and doc-blocks in system commandsAuthorAvtandil Kikabidze
- AuthorAvtandil Kikabidze
- e986a12d6efc Fixed minor code style issuesAuthorAvtandil Kikabidze
- 613de34dfd05 Added missing ampersand in if expressionsAuthorAvtandil Kikabidze