1040 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jannes Höke	c551d71735	add emoji field to sticker	2016-05-11 23:19:35 +02:00
Jannes Höke	bee3d881d1	location docstring fix	2016-05-11 23:07:32 +02:00
Jannes Höke	6ec81dd552	move cleaning updates to bootstrapping phase (#282)	2016-05-11 00:58:55 +03:00
Rahiel Kasim	6e9f30ca6e	fix merge conflict snakes	2016-05-02 16:37:45 +02:00
Jannes Höke	252cafb04c	fix docs for inlinekeyboardmarkup #277	2016-05-02 14:19:06 +02:00
Jannes Höke	d4f7b7165c	flake8: set max line length to 99	2016-05-02 10:35:20 +02:00
Leandro Toledo	0ed5e8e1a3	Merge pull request #274 from kiote/master ... Update README.rst	2016-05-01 18:29:55 -03:00
Ekaterina Krivich	335813a11a	Update README.rst ... answerCallbackQuery mentioned twice	2016-05-02 00:28:09 +03:00
Jannes Höke	10a98211f8	bump version to 4.0.3	2016-05-01 22:13:27 +02:00
Jannes Höke	b5570ddfa5	update CHANGES.rst	2016-05-01 22:13:24 +02:00
Rahiel Kasim	99c9544a27	Merge pull request #273 from python-telegram-bot/inlinequery_location ... Add location attribute #272	2016-05-01 21:27:19 +02:00
Jannes Höke	0e0611767a	add location attribute #272	2016-05-01 20:08:34 +02:00
Rahiel Kasim	4ba5fbf4f5	Merge pull request #271 from Djaler/master ... Fix Bot.getUpdates() docstring	2016-05-01 14:31:23 +02:00
Djaler	4b0be65a76	Fix Bot.getUpdates() docstring	2016-05-01 15:25:07 +03:00
Rahiel Kasim	5971cb35f8	fix merge conflict snakes with master	2016-04-30 14:56:48 +02:00
Jannes Höke	6e5302c089	pass args in timerbot example #270	2016-04-30 10:19:41 +02:00
Jannes Höke	5aab4525c2	add keyboard changes	2016-04-29 19:31:45 +02:00
Jannes Höke	62c651d167	bump version to 4.0.2	2016-04-29 19:31:45 +02:00
Jannes Höke	41e457f5ed	Merge pull request #269 from python-telegram-bot/buttons ... support str and KeyboardButton for reply_markup	2016-04-29 19:29:12 +02:00
Jannes Höke	4ce0ab53d0	Merge branch 'tsnoam-cr4.0_api2'	2016-04-29 18:57:23 +02:00
Jannes Höke	d940afa718	merge master into cr4.0	2016-04-29 18:37:41 +02:00
Rahiel Kasim	a327e9d6ff	support str and KeyboardButton for reply_markup	2016-04-29 17:42:45 +02:00
Rahiel Kasim	5e5510d42b	add deprecation warning for Python 2.6 users	2016-04-28 17:56:03 +02:00
Rahiel Kasim	73c60ee817	simpler py2/py3 input in clibot example	2016-04-28 17:32:10 +02:00
Rahiel Kasim	474d5f0c9f	update README and examples to new snake_case methods	2016-04-28 17:29:34 +02:00
Rahiel Kasim	74a2baf03d	update CONTRIBUTING guide	2016-04-28 15:41:44 +02:00
Rahiel Kasim	0612385233	set project max line length to 99 (flake8)	2016-04-28 15:03:43 +02:00
Rahiel Kasim	c0489db17c	fix import of deprecate function	2016-04-28 14:47:56 +02:00
Rahiel Kasim	592352c849	dispatcher/*handler methods to snake_case + deprecation warnings	2016-04-28 14:29:27 +02:00
Rahiel Kasim	9d367e9f2c	telegram.utils.deprecate: helper module to facilitate deprecation	2016-04-28 14:24:12 +02:00
Rahiel Kasim	d86ca30601	README: document snake_case alias methods for telegram.Bot	2016-04-28 12:44:35 +02:00
Rahiel Kasim	ec15e866be	add snake_case aliases for CamelCase methods	2016-04-28 12:20:42 +02:00
Leandro Toledo	998040da92	Update clibot.py ... Changes group=str to int	2016-04-27 22:10:31 -03:00
Noam Meltzer	0c74b3cfb9	bot.py + request.py: network_delay is unique for getUpdates	2016-04-28 01:41:32 +03:00
Noam Meltzer	0ca3ef7a38	utils.request: clean imports using feature.moves	2016-04-28 01:41:32 +03:00
Noam Meltzer	e160355190	remove unused imports, use future for urllib imports	2016-04-28 01:41:32 +03:00
Leandro Toledo	d80e0b4b8c	Add more test cases	2016-04-26 22:48:02 -03:00
Leandro Toledo	96d98084c7	Update README.rst ... Drops 4.0rc version argument	2016-04-26 20:39:34 -03:00
Jannes Höke	865bba3f3e	bump version to 4.0.1	2016-04-27 01:17:47 +02:00
Jannes Höke	2745023854	Merge branch 'master' of github.com:python-telegram-bot/python-telegram-bot	2016-04-27 01:06:58 +02:00
Jannes Höke	fd15e51e28	bump version to 4.0.0, update CHANGES	2016-04-27 01:02:57 +02:00
Leandro Toledo	d093506ef2	Merge pull request #261 from python-telegram-bot/unittest-bot2.0 ... Unittest for Bot 2.0 features	2016-04-26 19:44:55 -03:00
Jannes Höke	7f463131aa	re-order imports	2016-04-27 00:28:21 +02:00
Leandro Toledo	a79f636345	Formatting	2016-04-26 19:08:35 -03:00
Leandro Toledo	4a4dbcdbf8	unittest2 for py2	2016-04-26 19:02:17 -03:00
Leandro Toledo	7b13adb34b	Renaming methods for InlineKeyboardButton	2016-04-26 18:58:22 -03:00
Leandro Toledo	e905f310c4	Renaming methods for KeyboardButton	2016-04-26 18:57:52 -03:00
Leandro Toledo	631c825c1d	Merge remote-tracking branch 'origin/unittest-bot2.0' into unittest-bot2.0	2016-04-26 18:51:02 -03:00
Leandro Toledo	ed7ecddb8d	address to _address due nose limitations	2016-04-26 18:50:47 -03:00
Jannes Höke	a3dae1f112	use correct filter in command filter test	2016-04-26 23:49:59 +02:00