Commit Graph

402 Commits

Author SHA1 Message Date
Yago
c7403b0ced Merge pull request #63 from murcat/patch-1
Update bot.lua
2015-02-12 19:22:23 +01:00
murcat
7ad83b335b Update bot.lua 2015-02-12 18:01:04 +00:00
Yago
65313e24a4 Merge pull request #62 from timku/patch-1
Update xkcd.lua fixed issue with random xkcd.
2015-02-11 22:08:40 +01:00
yago
2937be7b77 Merge branch 'develop' 2015-02-11 22:02:01 +01:00
yago
b610511095 updated version 2015-02-11 22:01:31 +01:00
yago
522bfc9d14 F*cking tabs 2015-02-11 22:00:00 +01:00
yago
3d0b3a64f8 Merge branch 'doruq-patch-1' into develop 2015-02-11 21:58:37 +01:00
yago
475f6fcfec Merge branch 'patch-1' of git://github.com/doruq/telegram-bot into doruq-patch-1
Conflicts:
	plugins/stats.lua
2015-02-11 21:58:05 +01:00
Tim
f7015bf92c Update xkcd.lua 2015-02-11 17:32:09 +01:00
yago
7d25e0a3d5 Merge branch 'develop' 2015-02-04 23:07:18 +01:00
yago
b977e8893c updated version 2015-02-04 23:06:52 +01:00
yago
1ffd231ed5 Merge branch 'develop' 2015-02-04 23:05:06 +01:00
yago
9fc9383ab7 Help well formatted 2015-02-04 23:03:42 +01:00
yago
bd7264f496 XKCD url sussport 2015-02-04 22:15:49 +01:00
doruq
76b37397cb Typo fix in the description 2015-02-03 00:20:34 -05:00
yago
0f49b69133 Merge branch 'niteshjain-master' into develop 2015-02-02 23:22:21 +01:00
yago
4305c7b87e Returns HTTP Error if any in XKCD plugin 2015-02-02 23:19:10 +01:00
yago
da91a550fc Merge branch 'master' of git://github.com/niteshjain/telegram-bot into niteshjain-master 2015-02-02 23:02:07 +01:00
yago
944ee5b356 saves and print user id 2015-02-02 23:00:08 +01:00
yago
792209c607 Merge branch 'but3k4-master' into develop 2015-02-02 22:44:24 +01:00
yago
021d58e62a Merge branch 'master' of git://github.com/but3k4/telegram-bot into but3k4-master 2015-02-02 22:42:59 +01:00
yago
2309b9be87 updated tg 2015-02-02 22:39:51 +01:00
yago
d012c26fa6 starts function and little change on download_to_file 2015-02-02 22:22:05 +01:00
PotHix
88e094913c Fixes typo on 'eanbled' 2015-02-02 15:59:57 -02:00
Claudio Filho
f743a706af Fixing stats to show the result sorted by messages 2015-02-02 14:57:41 -02:00
yago
737738a330 Trim string function 2015-01-31 16:46:59 +01:00
Yago
6d388060c7 Update twitter_send.lua 2015-01-31 16:22:33 +01:00
Yago
5b0cbc8072 Update version 2015-01-24 17:18:13 +01:00
Yago
f6e6db50c0 Update README.md 2015-01-24 17:16:35 +01:00
yago
700f9e395e Enable more plugins by default 2015-01-24 17:07:00 +01:00
yago
a35bddc076 Help table generator 2015-01-24 17:07:00 +01:00
yago
4023ce7314 Enable more plugins by default 2015-01-24 16:56:32 +01:00
yago
013b927c83 Help table generator 2015-01-24 16:56:21 +01:00
Nitesh A Jain
9a343040c7 Oops!! Removed quotes around variable 2015-01-15 20:52:24 +05:30
Nitesh A Jain
81802ccdce added xkcd plugin 2015-01-15 02:16:47 +05:30
Yago
d9d96ed81c Update README.md 2015-01-14 15:52:30 +01:00
yago
0b55d3b6d3 GiphyAPI 2015-01-12 22:32:06 +01:00
yago
fb38228a97 GiphyAPI 2015-01-12 22:29:59 +01:00
Yago
1322757009 Update README.md 2015-01-12 21:26:24 +01:00
Yago
01d92dba1d Update README.md 2015-01-12 21:17:16 +01:00
yago
ff36d07e01 Merge branch 'develop' 2015-01-12 20:50:58 +01:00
yago
e0f374b0db just a "," 2015-01-12 20:50:22 +01:00
yago
bc1a9dc9e2 Merge branch 'asdofindia-google' into develop 2015-01-12 20:45:09 +01:00
yago
3725acdaa8 Merge branch 'google' of https://github.com/asdofindia/telegram-bot into asdofindia-google 2015-01-12 20:44:51 +01:00
yago
5eb58870d2 Version 0.8.3 2015-01-12 20:40:39 +01:00
yago
4872ebf3a5 CRON enabled. Mark msg as read when plugin matches. Updated version 2015-01-12 20:38:36 +01:00
yago
a780249142 help by default 2015-01-12 20:29:18 +01:00
Akshay S Dinesh
f50c130d9f fixed doubling of replies 2015-01-12 11:07:09 +05:30
Akshay S Dinesh
2665a6dae8 google search 2015-01-12 11:07:03 +05:30
Yago
5cad0c67d7 Update README.md 2015-01-06 21:40:11 +01:00