Code

Resolve develop conflicts#307

Code

Merged

zhuharev merged 32 commits intodevelopgo-telegram-bot-api/telegram-bot-api:developfrom resolve-develop-conflictsgo-telegram-bot-api/telegram-bot-api:resolve-develop-conflictsCopy head branch name to clipboardFeb 15, 2020

+342-14

Commits

Commits on Jun 30, 2018

• Add ParseMode to EditMessageCaption

  733amir

  committed
  f90493f

  Copy full SHA for f90493f

Commits on Jul 4, 2018

• Add cached types for inline query answer

  733amir

  committed
  31f4975

  Copy full SHA for 31f4975

• Correct formatting of code with go fmt

  733amir

  committed
  4edcb0f

  Copy full SHA for 4edcb0f

Commits on Sep 1, 2018

• merge main repo changes

  733amir

  committed
  d066ae7

  Copy full SHA for d066ae7

Commits on Oct 8, 2018

• Fix capitalization in doc.

  Syfaro

  committed
  9860bdf

  Copy full SHA for 9860bdf

Commits on Oct 15, 2018

• Merge branch 'master' of github.com:go-telegram-bot-api/telegram-bot-api

  733amir

  committed
  fad1895

  Copy full SHA for fad1895

• Fix backwards compatibility problem

  733amir

  committed
  b2addf5

  Copy full SHA for b2addf5

• Fix help tests

  733amir

  committed
  97ba9e1

  Copy full SHA for 97ba9e1

Commits on Dec 10, 2018

• Closing update body

  bcmk

  committed
  ab8d548

  Copy full SHA for ab8d548

Commits on Dec 14, 2018

• Merge pull request #211 from bcmk/close-body

  Show description for 9c39935
  zhuharev

  authored
  9c39935

  Copy full SHA for 9c39935

Commits on Dec 25, 2018

• Merge pull request #183 from 733amir/master

  Show description for ec221ba
  Syfaro

  authored
  ec221ba

  Copy full SHA for ec221ba

Commits on Jan 10, 2019

• Add type helpers to message entities.

  lzakharov

  committed
  fdf31c7

  Copy full SHA for fdf31c7

Commits on Jan 24, 2019

• Mark optional fields in InlineQueryResultGif as omitempty to not send zeros

  

  Yauhen Lazurkin

  committed
  74b2a53

  Copy full SHA for 74b2a53

• Complete definition of InlineQueryResultGIF to comply with Bot API

  

  Yauhen Lazurkin

  committed
  97a13fd

  Copy full SHA for 97a13fd

Commits on Feb 12, 2019

• added PinnedMessage in Chat struct

  Show description for 0b788c7
  Mephistophiles

  committed
  0b788c7

  Copy full SHA for 0b788c7

Commits on Mar 1, 2019

• Passing error code

  bcmk

  committed
  016d6ac

  Copy full SHA for 016d6ac

Commits on Apr 9, 2019

• Add support for caption_entities in Message type.

  Show description for ab4ab5e
  

  Andrey Kuzmin

  committed
  ab4ab5e

  Copy full SHA for ab4ab5e

Commits on Apr 24, 2019

• Merge pull request #229 from kak-tus/caption_entities

  Show description for ace7a9c
  Syfaro

  authored
  ace7a9c

  Copy full SHA for ace7a9c

• Merge pull request #219 from lzakharov/message-entity-helpers

  Show description for 2f55ae3
  Syfaro

  authored
  2f55ae3

  Copy full SHA for 2f55ae3

• Merge pull request #221 from yauhen-l/bugfix-omitempty-size-in-inline-gif-result

  Show description for 9b191db
  Syfaro

  authored
  9b191db

  Copy full SHA for 9b191db

• Merge pull request #223 from Mephistophiles/master

  Show description for e305b7a
  Syfaro

  authored
  e305b7a

  Copy full SHA for e305b7a

• Merge pull request #227 from bcmk/passing-error-code

  Show description for 87e7035
  Syfaro

  authored
  87e7035

  Copy full SHA for 87e7035

Commits on May 24, 2019

• Allow to change API endpoint for bot

  zhuharev

  committed
  8d34583

  Copy full SHA for 8d34583

• Merge pull request #238 from go-telegram-bot-api/add-api-endpoint-setter

  Show description for cea05bf
  zhuharev

  authored
  cea05bf

  Copy full SHA for cea05bf

Commits on Jul 4, 2019

• README: fix typo

  merothh

  committed
  c915cfd

  Copy full SHA for c915cfd

Commits on Sep 4, 2019

• Merge pull request #248 from merothh/master

  Show description for b33efee
  Syfaro

  authored
  b33efee

  Copy full SHA for b33efee

Commits on Jan 6, 2020

• Add inline venue type

  victpork

  committed
  1f98cd2

  Copy full SHA for 1f98cd2

Commits on Jan 13, 2020

• Update types.go

  Show description for 613005b
  chuhlomin

  authored
  613005b

  Copy full SHA for 613005b

• Merge pull request #297 from chuhlomin/patch-1

  Show description for 1944464
  Syfaro

  authored
  1944464

  Copy full SHA for 1944464

• Merge pull request #294 from mkishere/inline-venue

  Show description for aa124ef
  Syfaro

  authored
  aa124ef

  Copy full SHA for aa124ef

Commits on Feb 15, 2020

• Resolve develop and master conflicts

  zhuharev

  committed
  b40fac9

  Copy full SHA for b40fac9

• Fix old package import

  zhuharev

  committed
  6fcca60

  Copy full SHA for 6fcca60