1215 Commits

Author	SHA1	Message	Date
reality	4a7fcd57b3	Module config now loaded from config.json , rleloaded upon reloading and various module changes to make it work right [#474] [#489]	2013-06-03 23:00:23 +00:00
reality	ec0c4ad781	merge of terror #2	2013-06-01 17:57:07 +00:00
reality	39c298037d	fix string syntax error	2013-06-01 17:01:24 +00:00
reality	dffdf7486f	update submodules	2013-06-01 16:46:57 +00:00
Roi	505d69ef73	German translations	2013-06-01 16:16:24 +00:00
reality	b4581b1995	remove extra head	2013-06-01 15:55:48 +00:00
reality	a01438a879	worst merge 2013 eu	2013-06-01 15:55:09 +00:00
reality	0d67f12991	trim quote keys	2013-05-30 08:15:32 +00:00
reality	90d77e4c67	Merge branch 'master' of github.com:reality/depressionbot	2013-05-30 04:14:07 +00:00
reality	553d3afccc	user interpolation for quotes	2013-05-30 04:13:54 +00:00
Luke Slater	5eb4502aa5	Merge pull request #485 from ODyckhoff/master ... Welsh Translations	2013-05-29 12:32:20 -07:00
reality	7303fd6a01	update stats	2013-05-29 18:41:42 +00:00
reality	378d3da0f0	update github	2013-05-29 13:00:00 +00:00
Sam Nicholls	742774fbfe	Touch spotify README	2013-05-29 13:40:01 +02:00
Owen Dyckhoff	62700862e4	Completed users module Welsh translations in strings.json	2013-05-29 13:03:11 +02:00
Owen Dyckhoff	d825499651	I cannot be trusted with quotation marks.	2013-05-29 12:48:10 +02:00
Owen Dyckhoff	2cbf862434	Completed spotify module Welsh translations in strings.json	2013-05-29 12:46:47 +02:00
Owen Dyckhoff	9d709cd42a	Completed report module Welsh translations in strings.json	2013-05-29 12:38:50 +02:00
Owen Dyckhoff	755099c5ee	Closed a quotation mark that I missed >.>	2013-05-29 12:23:19 +02:00
Owen Dyckhoff	1869e82b45	Completed reddit module Welsh translations in strings.json	2013-05-29 12:21:48 +02:00
reality	080770768d	syntax error in admin strings	2013-05-28 22:30:24 +00:00
reality	2ca2cc01d0	missing comma in quotestrings	2013-05-28 22:28:13 +00:00
Owen Dyckhoff	5856dcb415	Completed rain module Welsh translations in strings.json	2013-05-29 00:05:53 +02:00
Owen Dyckhoff	84645dae93	Completed quotes module Welsh translations in strings.json	2013-05-28 23:50:49 +02:00
Owen Dyckhoff	ff9532d503	Completed project module Welsh translations in strings.json	2013-05-28 23:13:16 +02:00
Owen Dyckhoff	5be4c5e9e7	Completed link module Welsh translations in strings.json	2013-05-28 22:17:07 +02:00
Owen Dyckhoff	1b834c16ce	Completed kick module Welsh translations in strings.json	2013-05-28 22:11:55 +02:00
Owen Dyckhoff	f576a9074a	Completed imgur module Welsh translations in strings.json	2013-05-28 21:57:20 +02:00
Owen Dyckhoff	0234d7a52a	Corrected Welsh spelling error and substituted more appropriate word in admin module strings.json	2013-05-28 21:55:27 +02:00
Owen Dyckhoff	d0205e0468	Completed ignore module Welsh translations in strings.json	2013-05-28 21:53:16 +02:00
Owen Dyckhoff	6ad4b1976b	Completed dns module Welsh translations in strings.json	2013-05-28 21:24:41 +02:00
Owen Dyckhoff	19332bf1d5	Completed command module Welsh translations in strings.json	2013-05-28 21:14:13 +02:00
Owen Dyckhoff	b0852c2fac	Completed admin module Welsh translations in strings.json	2013-05-28 20:09:32 +02:00
reality	150821cbb3	fix db pointer for imgur olDB	2013-05-28 17:40:25 +00:00
reality	3726be64b7	yee	2013-05-27 17:48:36 +00:00
reality	429eafd8e4	banOutput option in command [#460]	2013-05-27 17:45:30 +00:00
reality	e1ea156a41	merge udFallback into database branch [#477]	2013-05-27 17:33:10 +00:00
reality	d5a4b288f7	udFallback option for quote retrieval [#477]	2013-05-27 17:16:23 +00:00
reality	7e4ae2460a	Automatic callback for ~ajs [#476]	2013-05-26 20:24:05 +00:00
reality	e7605e0c0e	Merge git://github.com/reality/depressionbot into database	2013-05-26 17:20:49 +00:00
reality	0cb8147abb	improve imgur linkhandler efficiency by using only one callback and link name feature [#475]	2013-05-26 17:19:25 +00:00
reality	3afb53939a	Get gallery info depending on if it is an image or album [#475]	2013-05-26 17:10:21 +00:00
reality	18e6053399	Support for imgur album data [#475]	2013-05-26 16:55:45 +00:00
reality	d8191c8232	Update install.sh modules and update web docs [#464][#351]	2013-05-26 15:49:44 +00:00
reality	1ce4b05932	documentation for the spotify module	2013-05-26 15:38:48 +00:00
reality	3148b3e434	document new command config features [#467][#351]	2013-05-26 14:16:56 +00:00
reality	9847a05301	Add accessOutput command to tell users when they are not authorised to run a command [#467]	2013-05-26 14:14:01 +00:00
reality	d9850d19d5	fix some more mergeuser issues [#470]	2013-05-26 13:29:21 +00:00
reality	f69f999118	fix various mergeusers hooks [#472]	2013-05-26 13:11:09 +00:00
reality	5dddae4f00	mergeChannelUsers internal API function in users + mergeusers seems to be working [#470]	2013-05-26 12:37:37 +00:00