Commit Graph

531 Commits

Author SHA1 Message Date
c712fa44b2 removed neko pattern from kitty.lua 2015-07-18 15:31:52 +02:00
b307e18d34 new plugin gifeye.lua 2015-07-18 15:31:00 +02:00
39608e9205 ignoring urbanup.com in url_title.lua 2015-07-13 23:01:19 +02:00
b95afbb819 link as pattern in urban_dictionary.lua 2015-07-13 23:00:24 +02:00
b2ea23bfb2 rss only for privileged user 2015-07-09 13:08:23 +02:00
07073f4034 Spelling fix 2015-07-09 01:01:55 +02:00
6d63c69572 Spelling fix 2015-07-09 01:00:24 +02:00
a9ae12d39a translation for days and months. command for local time 2015-07-08 21:29:43 +02:00
9a67fd6d08 changed output text 2015-07-08 21:26:54 +02:00
9efd9d7921 idc doesn't need a extrawurst 2015-07-07 18:27:15 +02:00
47f08e01a4 date plugin overwritten 2015-07-07 14:26:58 +02:00
3b63b7b54e changed text for temp command 2015-07-06 18:31:44 +02:00
e81c9b4860 --no-playlist and --max-filesize does not work anymore 2015-07-05 19:25:49 +02:00
d3ea32464a added nbc, idc, lf and lod to specials.lua 2015-07-03 14:48:11 +02:00
76ca438c16 added "FLIP THAT TABLE" to special.lua 2015-07-02 21:43:24 +02:00
d9a7d817ce new plugin minecraft_skin.lua 2015-07-02 17:16:43 +02:00
07f3ca4f6c gsub strikes back! 2015-07-02 14:09:56 +02:00
c530267130 --no-continue 2015-06-29 21:11:47 +02:00
e332ef1dc6 --no-playlist --no-continue --max-filesize 15m 2015-06-29 21:11:31 +02:00
2a1b85ad10 Spelling fixes 2015-06-29 17:18:46 +02:00
5266b93d0f added ftp plugin
thx @Brawl345
2015-06-28 19:16:56 +02:00
baeae693bd webshot patterns without https?:// 2015-06-28 19:16:11 +02:00
6d78648182 new plugin youtube_mp3 2015-06-26 14:04:21 +02:00
eaa56879ea little thing 2015-06-26 14:02:20 +02:00
f3571e2091 added function unescape 2015-06-25 22:10:29 +02:00
69737edfd5 Fixed tweet plugin: id match and return message 2015-06-25 22:10:01 +02:00
91edf21fcf gsub and other things 2015-06-25 22:08:20 +02:00
5937e58687 choose size of picture in webshot 2015-06-25 22:07:45 +02:00
632c513bf7 img search plugins ignoring svg and send gif as document 2015-06-24 02:32:35 +02:00
f498dfe32e pattern-fix for webshot.lua 2015-06-24 02:31:20 +02:00
3a104f5c04 Chuck Norris unesape HTML but HTML cant scape from Chuck Norris 2015-06-23 16:41:31 +02:00
04a95b6cc4 new plugin music.lua 2015-06-23 16:41:00 +02:00
425a32a4f8 pattern-fix for webshot.lua and url_title.lua 2015-06-23 16:40:17 +02:00
243418237b fixed rss sync 2015-06-22 00:43:32 +02:00
5dde8edad8 url-fix for wiki.lua 2015-06-21 22:00:19 +02:00
724696f2f2 # in pattern for url_title 2015-06-19 22:45:42 +02:00
48c90b3717 fixed url in wiki.lua 2015-06-19 22:44:57 +02:00
42af2212d0 return url in wiki.lua 2015-06-17 22:58:05 +02:00
30dcf34395 patterns fixed on hdf.lua 2015-06-17 22:24:05 +02:00
3f16119f57 new wiki plugin
20% cooler
2015-06-17 22:23:25 +02:00
23cd446e0b fixed a critical bug in cowsay and youtube_dl 2015-06-17 20:30:14 +02:00
bcb00f488f new plugin flip_text 2015-06-17 20:27:21 +02:00
ca66036c0e aaaand gsub ._. 2015-06-17 20:26:37 +02:00
c5da7388b1 disabled annoying messages and german translate in manager.lua 2015-06-16 22:15:22 +02:00
df7817a3be disabled annoying message and pattern tgservice in manager.lua 2015-06-16 21:50:08 +02:00
bfff039a01 removed usage from media.lua 2015-06-16 21:48:35 +02:00
2436348e90 update rss.lua
other text
msg when sync
removed some patterns
2015-06-16 21:47:48 +02:00
d27a686e09 Merged some plugins 2015-06-16 21:42:51 +02:00
77fadb1806 old/unused plugins 2015-06-16 21:40:12 +02:00
f228fea149 added manager plugin 2015-06-15 23:04:20 +02:00
c817c774b1 gsub "&" for twitter.lua 2015-06-15 16:45:26 +02:00
d3c7322222 fixed pornhub and youporn plugin
thx @synk0
2015-06-15 14:59:55 +02:00
e2e8bee99e fixed wiki plugin
Wikipedia links working again
2015-06-15 14:57:40 +02:00
16286b9dae url_title gsub ' 2015-06-12 15:38:19 +02:00
08dd054a1e new plugin torrent_search 2015-06-11 17:11:24 +02:00
2610903759 new plugins yagyuu and riko
by @Brawl345
2015-06-11 17:11:00 +02:00
782020e61f gsub gsub gsub 2015-06-11 17:10:03 +02:00
87ea7b5771 kitty plugin with gif support 2015-06-11 16:49:29 +02:00
23e0b9faeb kitty.lua use thecatapi.com 2015-06-11 16:16:35 +02:00
99391a8667 youtube_search sends video info 2015-06-10 19:40:12 +02:00
bc044b3e44 added time to date.lua 2015-06-10 19:02:41 +02:00
bf1756c4cb removed screen.lua, added screen, update and upgrade function to sh.lua 2015-06-10 15:06:52 +02:00
64bb221da6 gsub ‹ 2015-06-10 14:30:39 +02:00
768fa91867 added link to tweet in msg 2015-06-10 14:30:08 +02:00
6893208490 fixed a bug with + 2015-06-10 14:29:22 +02:00
bb3463de47 added temp, volt and takt to sh.lua 2015-06-10 14:28:44 +02:00
0fab7d8ad7 renamed danbooru2 to danbooru 2015-06-10 14:28:10 +02:00
dc271edeba update alive.lua
new answer
new pattern
2015-06-09 16:28:06 +02:00
e0d26820be youtube.lua show the duration 2015-06-09 16:23:27 +02:00
862885fa90 gsub | 2015-06-09 16:21:07 +02:00
7c8b46680d rss.lua german translation 2015-06-08 23:32:11 +02:00
09899ac662 translate plugin works now 2015-06-08 21:53:37 +02:00
43eebda05d removed unused plugins 2015-06-08 21:51:45 +02:00
7e825f7363 weather plugin works now 2015-06-08 21:30:07 +02:00
9cb4440ab9 updated id.lua
send_large_msg
string.gsub
2015-06-08 21:14:29 +02:00
aa2db63a62 myanimelist with 1 result
you can set number of results
2015-06-07 22:51:36 +02:00
a752cabca5 Use ?split=false in dogify plugin 2015-06-07 22:50:19 +02:00
fc4c3eb4cf screen needs now privileged user 2015-06-07 22:49:42 +02:00
e92183e680 finally sends the source 2015-06-07 22:49:11 +02:00
77c85822c7 update youtube_dl 2015-06-07 22:47:21 +02:00
e7ed1c0c19 new plugin face 2015-06-07 22:46:18 +02:00
795821586d updated stats.lua 2015-06-06 22:16:42 +02:00
4b0fee536f new plugins alive.lua and tts.lua 2015-06-06 22:16:11 +02:00
4c1f709c1e updated youtube_dl.lua 2015-06-06 22:15:31 +02:00
7c62730cd4 improved afk plugin
removed wd plugin
2015-06-06 22:15:05 +02:00
2deb795a35 test with patterns 2015-06-02 21:53:29 +02:00
a474a1f940 new plugin rss (does not work atm) 2015-06-02 21:52:21 +02:00
13f3a0057d removed old and added new sticker plugin 2015-05-28 21:37:36 +02:00
8c037629a7 new plugins
4chan.lua
notizen.lua
2015-05-28 21:35:56 +02:00
bd5ae0d642 big update
too much changed ._.
2015-05-28 16:47:30 +02:00
1e77e4de80 new plugin qr_codes 2015-05-27 18:56:46 +02:00
4339269284 update stickerpacks.lua (thx wesley) 2015-05-27 18:56:23 +02:00
8bd373bade few little changes 2015-05-27 18:55:36 +02:00
cc64c13884 new plugin youtube_dl 2015-05-24 18:23:30 +02:00
595d679d8b update pokedex.lua 2015-05-24 14:54:03 +02:00
023a8b34f8 new plugin stickerpacks 2015-05-23 21:30:26 +02:00
b1bd41051e renamed search_youtube to youtube_search 2015-05-23 21:30:08 +02:00
4087099c47 string.lower 2015-05-23 17:51:24 +02:00
759a54a93b german pokedex 2015-05-23 17:23:57 +02:00
952271851e new plugins
kick.lua
pokedex.lua
router_status.lua
whereisip.lua
2015-05-23 16:37:42 +02:00
dcccb2c8e9 little changes 2015-05-22 17:01:33 +02:00
eb02fcf372 update screen.lua 2015-05-22 14:50:58 +02:00
3000ce5a4e new plugin screen
make a screenshot!
2015-05-22 14:28:23 +02:00
ba42811220 removed dmm.lua
its crap
2015-05-21 20:52:55 +02:00
f35e2fca84 media.lua sends now webp 2015-05-21 19:04:12 +02:00
2c489f64f1 few changes
new insider for insider.lua
update media_download.lua and old.lua
2015-05-21 17:06:45 +02:00
ccbb1bdde8 bugfix in insider.lua 2015-05-19 20:59:24 +02:00
86bb71517b new plugin insider 2015-05-19 18:41:59 +02:00
9b1c4c18b6 update id.lua removed myid.lua 2015-05-19 18:41:36 +02:00
14cef42529 new plugins
id.lua
old.lua
2015-05-18 21:43:42 +02:00
294d5f836c new plugin dogify 2015-05-16 20:32:21 +02:00
c5bf43c1b9 dscription 🐸🐸🐸 2015-05-16 16:35:31 +02:00
b15c5a2f66 added frosch plugin 2015-05-16 16:33:53 +02:00
643d2554bf merge upstream
Disabled pattern lowercase matches
Update isup.lua
2015-05-15 15:37:59 +02:00
38268496e0 removed dicks.lua added gay.lua 2015-05-13 20:20:56 +02:00
5161642848 new plugin webshot 2015-05-12 20:38:31 +02:00
0c97b53d58 more german translation and optimizations 2015-05-12 20:15:15 +02:00
ef6e633da9 little changes on tweet.lua and twitter_send.lua 2015-05-11 22:02:03 +02:00
5c106fb0c6 new plugin isup 2015-05-11 20:04:26 +02:00
01098fb4e8 updated minecraft.lua 2015-05-11 20:04:09 +02:00
2c3297f834 updated rechner.lua 2015-05-11 20:02:19 +02:00
f46036adc4 chat id example for boersedown.lua 2015-05-10 20:29:40 +02:00
17a14d34c0 removed nonfunctional plugins 2015-05-10 13:51:52 +02:00
2603df596e few little changes 2015-05-10 13:09:06 +02:00
90428735d3 added new plugins
date.lua
get.lua
invite.lua
location.lua
set.lua
time.lua
twitter.lua
weather.lua
youtube.lua
2015-05-09 16:34:53 +02:00
6254e51e8c updated plugins 2015-05-07 19:49:26 +02:00
202013fb9a myanimelist and youporn search works again 2015-05-07 19:48:49 +02:00
8b808b27f5 new wat picture 2015-05-07 19:48:08 +02:00
3f5313f1c2 new plugins
dmm.lua
ehentai.lua
minecraft.lua
2015-05-07 19:47:06 +02:00
d3439a0faf new plugin tweet 2015-05-02 21:25:38 +02:00
399b2d8846 temporary removed source from images plugins 2015-05-02 21:25:22 +02:00
4352c2297d Revert "temporary removed source from images plugins"
This reverts commit bcf65bcaf6.
2015-05-02 21:22:41 +02:00
bcf65bcaf6 temporary removed source from images plugins 2015-05-02 21:22:13 +02:00
2d03b0d72d New plugin wat 2015-04-30 16:04:22 +02:00
811834a544 added myanimelist plugin 2015-04-29 21:57:38 +02:00
bcb84c5882 url_title ignore Object moved 2015-04-29 21:32:17 +02:00
f02a2761d0 url_title ignores 521: Web server is down 2015-04-28 19:29:48 +02:00
5d55b9a1a2 updated usage and patterns 2015-04-28 17:49:11 +02:00
b18d2c6197 new plugin spam 2015-04-28 17:47:54 +02:00
33a4607a3a new plugin quotes 2015-04-28 17:46:31 +02:00
737be02e0d new plugin Danboru 2015-04-28 17:46:04 +02:00
92f0e86afb new plugins
wallpaper.lua
wallpaper_nsfw.lua
dicks.lua (its shit)
2015-04-27 19:55:23 +02:00
fa55b0b14a merge upstream
get_content_type_no_sub
media plugin forces type to upload
2015-04-26 21:19:31 +02:00
fe78a49367 merge upstream
Colors on Non valids. Check msg.to.id and msg.from.id
function load_from_file(file)
vardump uses serpent
tabs on scandir
Failed on Free games (no price info)
Google with unescaped URLs
2015-04-26 19:16:44 +02:00
94fea4e9aa new plugin translate 2015-04-26 13:28:31 +02:00
8b42466881 new plugin furaffinity (does not work yet) 2015-04-26 13:28:06 +02:00
5381f7b182 new plugin e621 (does not work yet) 2015-04-26 13:27:51 +02:00
e31c706579 Added picture sources to hdf plugin 2015-04-23 17:42:34 +02:00
aeb5bceac7 New pluging hdf.lua 2015-04-23 17:31:04 +02:00
d97b6346e4 Added new patterns to kitty plugin 2015-04-23 17:30:10 +02:00
b9dd4067bf Don't show the last name in stats 2015-04-23 17:29:42 +02:00
358c1979e5 Ignoring Redirection in url_title 2015-04-23 17:29:03 +02:00
d1dfb87752 url_title ignores 302 Moved 2015-04-22 16:49:24 +02:00
7534694efc boobs plugin with source 2015-04-22 16:48:54 +02:00
1e53942a9e url_title ignore twitch 2015-04-21 15:59:09 +02:00
f5411aecb7 search_youtube works again 2015-04-21 14:21:35 +02:00
4021a1c84d many code cleanup in plugins 2015-04-20 18:52:25 +02:00
1c93a20e11 new plugins: pornhub.lua and youporn.lua 2015-04-20 01:53:34 +02:00
a562cbb49a new patterns added to stille plugin 2015-04-20 01:52:53 +02:00
90f0f782ed some little changes on echo.lua and twitter_send.lua 2015-04-19 22:27:37 +02:00
2827c774ce search_youtube plugin update 2015-04-19 22:03:06 +02:00
1cf4948539 3 new plugins 2015-04-19 21:18:06 +02:00
94d7d20415 Few changes on kitty.lua and url_title.lua
kitty.lua: Code cleanup
url_title.lua: Ignoring deviantart links
2015-04-18 18:48:20 +02:00
5159c65794 New plugin "justkitten" 2015-04-18 18:46:37 +02:00
85437c8dc0 Some little changes 2015-04-17 16:29:30 +02:00
d71cac24cd Updated plugin boobs.lua 2015-04-16 21:42:25 +02:00
5982738514 Updated plugin plugins.lua
Save reenabled plugin on data/config.lua
Changed filename to plugin_name
2015-04-16 21:42:05 +02:00
5bf2b6bf17 9gag deletes img after sended 2015-04-16 20:14:36 +02:00
848c9d6781 Added more extension to media plugin 2015-04-16 20:13:42 +02:00
337ef38509 Added wikipedia plugin 2015-04-16 20:13:07 +02:00
22cff42b7b New command added to youtube_search plugin 2015-04-15 18:45:45 +02:00
cc6b4d76f4 Stats without user id 2015-04-15 18:44:42 +02:00
4f9fd9389e Added rechner plugin 2015-04-14 22:20:26 +02:00
0d2a782c1f privileged = true 2015-04-14 22:11:19 +02:00
a59ddef152 Added reload plugin 2015-04-14 22:08:25 +02:00
b060a9628d Changed command 2015-04-14 21:22:02 +02:00
0be5585005 First commit of Mikubot 2015-04-14 20:23:55 +02:00
ce629850e2 First commit of Mikubot 2015-04-14 20:21:23 +02:00
yago
60b6a28b61 Some changes on search_youtube 2015-04-13 00:33:58 +02:00
yago
53de041343 Merge branch 'master' of https://github.com/ShittyAdvice/telegram-bot into ShittyAdvice-master 2015-04-13 00:06:12 +02:00
yago
b39ce5dd87 Stats are saved on cron 2015-04-12 23:53:42 +02:00
yago
d35a3e8770 removed is_disabled on msg_vaild. Fix 2015-04-12 23:21:37 +02:00
yago
dca731c18e Check channel enabled as pre_processor 2015-04-12 23:08:42 +02:00
yago
0438abeee3 Merge branch 'master' of https://github.com/soend/telegram-bot into soend-master
Conflicts:
	bot/bot.lua
2015-04-12 22:08:56 +02:00
yago
91aac0c138 Disable plugins only on specific chats (current chat) 2015-04-12 21:55:01 +02:00
yago
b304f4fb49 download_media plugin 2015-04-12 20:14:21 +02:00
yago
883f31e73a renamed lex to pre_process 2015-04-12 20:13:52 +02:00
yago
e269a00ba2 sudo users can read user stats 2015-04-12 17:56:44 +02:00
yago
68050fe52a Stats only for chats 2015-04-11 19:27:45 +02:00
Yago
5cc95b6ee4 Update version.lua 2015-04-11 18:32:07 +02:00
Yago
35a2c59b13 Update steam.lua
Sends header_image
2015-04-11 01:12:19 +02:00
Vincent Castellano
ba6fba21d0 Improve the pricing display 2015-04-10 13:01:15 -07:00
Vincent Castellano
4f288360e4 Add new plugin for printing Steam data for store URLs. 2015-04-10 13:01:15 -07:00
Yago
9c7fc012e1 Update giphy.lua 2015-04-09 21:57:54 +02:00
Yago
a307ee29bf Merge pull request #99 from JulioC/master
Added alt text to the resulting message
2015-04-09 21:56:41 +02:00
Yago
46145f06d6 Merge pull request #101 from Surye/patch-2
Allow the question to follow the command.
2015-04-09 21:56:31 +02:00
JulioC
2f5fbb755c Merge remote-tracking branch 'upstream/master' 2015-04-09 14:31:54 -03:00
Vincent Castellano
76960ef4ec Allow the question to follow the command. 2015-04-08 17:11:53 -07:00
Vincent Castellano
878462030d Don't 0 index the array of images. 2015-04-08 17:08:08 -07:00
Júlio César
d27afc1b39 Added alt text to the resulting message 2015-04-07 22:21:56 -03:00
yago
f4ac6057ba Check if image not found 2015-04-07 22:58:46 +02:00
yago
eecb820568 Identation as spaces 2015-04-06 23:28:20 +02:00
yago
7f9bbae615 function order changed 2015-04-06 23:28:20 +02:00
yago
0277d3bab7 Locals on plugins 2015-04-05 16:27:04 +02:00
yago
c19c30933d Locals on 9gag 2015-04-05 16:26:30 +02:00
yago
0c2bb7329c Removed help markdown function 2015-04-05 16:20:19 +02:00
yago
4edd28906b Boobs help 2015-04-05 15:06:29 +02:00
yago
8b38b3a0dc Local functions on help 2015-04-05 15:00:16 +02:00
yago
6ebf354735 Better help 2015-04-05 13:57:25 +02:00
Malte Husmann
e152824cd5 Added two plugins: hackernews, magic 8ball 2015-04-03 23:02:45 +02:00
Yago
8f2db54d9c Update media.lua 2015-04-02 23:45:45 +02:00
yago
8f00b554a2 Indentation an little little little changes 2015-03-31 20:17:45 +02:00
CheatCoder
841f5c3f69 Fix youtube.lua crash
Sry for this little bug =)
2015-03-25 22:28:05 +01:00
CheatCoder
02d72e0b62 Update search_youtube.lua to send Title image and description 2015-03-25 10:58:21 +01:00
Brayden
cf16172072 Support Youtube links with "_" in their URL
Noticed when https://www.youtube.com/watch?v=rE3j_RHkqJc didn't gen anything.
2015-03-24 19:56:05 -07:00
Yago
b2165a0983 Stats pattern priority. #89 2015-03-20 14:27:38 +01:00
ShittyAdvice
6b5ed82584 Created an YouTube search plugin 2015-03-16 20:28:13 +01:00
yago
ca3eeac0ec Translator plugin. Closes #76 2015-03-14 17:30:12 +01:00
yago
c189cfc93f lex(msg) function 2015-03-14 17:23:38 +01:00
soend
061dee2fa2 Merge pull request #1 from yagop/master
Updating to latest
2015-03-12 09:46:42 +02:00
Yago
e30fb76ac5 Update boobs.lua usage 2015-03-10 18:21:37 +01:00
Lee Watson
8f9d1a1e59 tigle -> title 2015-03-10 00:34:17 +00:00
yago
8bb1a19cfc Butts bugfix 2015-03-08 22:11:00 +01:00
yago
9c2582f627 !butts command 🍑 and indentation in boobs.lua 2015-03-08 22:02:19 +01:00
Yuri
cfff96677a Added boobs plugin 2015-03-06 04:30:44 +03:00
yago
7224cec834 Fixed some tabulation 2015-03-04 23:51:36 +01:00
Yago
230fbc0177 Fix DOT extension. 2015-03-04 23:22:00 +01:00
Yago
adf8120c70 Fix DOT extension. 2015-03-04 23:14:39 +01:00
yago
13a787e577 giphy sends original if downsized doesn't exists 2015-02-28 12:30:58 +01:00
Yago
5c38c4842f Update giphy.lua 2015-02-27 21:31:14 +01:00
Yago
84b7062aed Update giphy.lua 2015-02-27 21:23:23 +01:00
Priit Heinsaar
edd8a50629 Added functionality to disable bot responding in disable channels 2015-02-27 15:06:12 +02:00
PioneerAxon
f55e85efcd Add new plugin for voting system.
Allows voting session in group conversations.
2015-02-26 01:33:25 +05:30
Brayden
c434dbedfc Fix for Tweets without extended_entities
I had put https://twitter.com/FRCTeams/status/568890597009960961 into a chat, but there was no response save for:

```
 *** lua: plugins/twitter.lua:50: attempt to index field 'extended_entities' (a nil value)
```

This fixes that bug by checking for the existence of ``extended_entities`` before trying to get it's ``media``.
2015-02-22 16:05:24 -08:00
yago
3b59be34c5 Some changes on giphy plugin 2015-02-23 00:11:31 +01:00
yago
6b49398098 Troubles sending images 2015-02-22 22:34:10 +01:00
yago
16c51485bc Merge branch 'master' of git://github.com/id-mozilla/telegram-bot into id-mozilla-master 2015-02-19 22:01:27 +01:00
yago
60ec571bfc Return Giphy error when GIF not found 2015-02-19 21:50:13 +01:00
Arief Bayu Purwanto
ee6b91da14 initial bugzilla specific bot command 2015-02-18 12:01:47 +07:00
yago
975d57c827 Closes #68 2015-02-15 20:27:21 +01:00
yago
d069eaa809 updated version 2015-02-15 16:59:46 +01:00
yago
e0dd062cfe gps.lua no delay_s 2015-02-15 16:59:03 +01:00
yago
fbf6c48476 no delay_s on location.lua 💥 2015-02-15 16:54:03 +01:00
yago
86923b229e giphy uses send_document_from_url 2015-02-15 14:33:48 +01:00
yago
3df9d9c3f3 Functions for downloading and removing images async. The magic of cackbacks 🌟 2015-02-15 14:06:01 +01:00
yago
54203f7dbd Merge branch 'patch-1' of git://github.com/juanmal/telegram-bot into juanmal-patch-1 2015-02-15 12:15:50 +01:00
yago
fb415b7143 Changed text when values loaded 2015-02-15 12:12:03 +01:00
Yago
f595cb1c85 Merge pull request #65 from but3k4/master
Added the ability to quote users texts by chat.
2015-02-14 20:00:11 +01:00
Claudio Filho
c2a5380507 Add imdb plugin 2015-02-13 13:45:27 -02:00
Claudio Filho
bdb9639485 Merge quote files into one 2015-02-13 13:38:28 -02:00