Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity
1,442 Commits 3 Branches 0 Tags 3.9 MiB
840f110317
Commit Graph

1010 Commits

Author SHA1 Message Date
Douglas Gardner
681f56f465 nvi → na'vi 2013-03-24 19:31:58 +00:00
Thomas Menari
67f88097df Update strings.json 2013-03-24 19:26:27 +00:00
reality
9443970c89 FIXED THAT MOTHERFUCKING BASTID BUG I AM THE RESURRECTION YEAAAAAAAAA [#272] 2013-03-24 18:05:57 +00:00
reality
17c2c4b317 Fix ~setaliasparent [#272] 2013-03-24 16:59:26 +00:00
reality
3814df98f6 users module almost fully operational with databank (few kinks in moderation commands still) [#272] 2013-03-24 16:04:01 +00:00
reality
edcbe501e8 users onLoad and nick/join listener now databankised [#272] 2013-03-24 12:54:19 +00:00
reality
aa6a5fce42 databankise users listener, add getChannel to users api [#272] 2013-03-24 12:26:33 +00:00
reality
d30aa145aa Changed users API to databank [#272] 
Behavioural changes:

* API functions no longer return values, callbacks must be submitted. These will be documented soon.
* resolveUser now returns the user record instead of just a resolved username. This means many less search operations.
* resolveUser now returns false instead of the original nick passed to it in the case of being unable to find a user.
* getServerUsers has been removed, as it is now unnecessary.
 2013-03-24 11:34:52 +00:00
reality
cbc42e6fc3 Merge git://github.com/reality/depressionbot into database. Also Users API now databankerised 
Conflicts:
	modules/quotes/commands.js
 2013-03-24 11:09:40 +00:00
reality
71c0bdb760 all commands but ~qstats and ~rq in quotes use databank [#272] 2013-03-23 13:24:13 +00:00
Douglas Gardner
57dcc0daf1 remove try catch in favour of boring if(error){} 2013-03-22 15:39:29 +00:00
reality
7bcb136e26 some initial work on users api over to databank [#272] 2013-03-22 11:44:27 +00:00
reality
3ac1c8189f bump jsbot 2013-03-22 11:18:06 +00:00
reality
0c263a2005 Merge pull request #324 from JohnMaguire2013/help 
adding forgotten usage file for ~help and ~usage
 2013-03-22 04:17:37 -07:00
reality
4a7880d803 Merge pull request #325 from JohnMaguire2013/nick 
use new JSBot.parse() NICK action variables.
 2013-03-22 04:17:28 -07:00
reality
84c311ee41 Stop [#326] happening again in the admin module by applying admin to all commands by default 2013-03-22 10:58:40 +00:00
Luke Slater
ccc8d6c6e9 merge clash 2013-03-22 10:49:22 +00:00
Luke Slater
8d7962acc8 change module names each loop in module loader to use underscore each 2013-03-22 10:48:36 +00:00
reality
a5f2c35b4d Merge pull request #323 from zuzak/dns 
DNS functionality
 2013-03-22 03:45:28 -07:00
reality
b8f089284f Merge pull request #322 from JohnMaguire2013/ignore 
little bit of cleanup on dbKeys of admin/ignore modules
 2013-03-22 03:44:25 -07:00
John Maguire
eff41ee844 use new JSBot.parse() NICK action variables. 2013-03-21 15:58:33 -04:00
John Maguire
eea6643028 adding forgotten usage file for ~help and ~usage 2013-03-21 15:08:48 -04:00
Sam Nicholls
9034dbae6b Patch pushconfig critical 2013-03-21 18:48:06 +00:00
Douglas Gardner
0bb331f87d add basic dns function thingies 2013-03-21 18:29:18 +00:00
John Maguire
3193e45a95 removing empty dbKeys from admin module config 2013-03-21 14:23:58 -04:00
John Maguire
18227fa30b adding "bans" to ignore module dbKeys 2013-03-21 14:23:14 -04:00
reality
774b6673c5 what is stats? baby dont change me, dont change me, no more 2013-03-21 17:35:21 +00:00
reality
415047f765 remove ban/unban from admin [#321] 2013-03-21 14:47:11 +00:00
reality
c26d0acfc0 Merge branch 'ignoreban' of https://github.com/JohnMaguire2013/depressionbot 2013-03-21 14:45:34 +00:00
reality
0f2c77187c Merge pull request #320 from JohnMaguire2013/admin 
fix error on "showconfig" with no paremeters (now shows root config)
 2013-03-21 07:35:32 -07:00
reality
7fdf145e26 Merge pull request #319 from JohnMaguire2013/quotes 
fixing some minor bugs in quotes module
 2013-03-21 07:31:45 -07:00
reality
ea948a4ae4 Merge pull request #318 from JohnMaguire2013/users 
fixes the issue where users are not tracked correctly on some IRCd's
 2013-03-21 07:29:48 -07:00
reality
e811c47a63 Merge pull request #316 from JohnMaguire2013/reloading 
fixing some bugs related to loading
 2013-03-21 07:28:17 -07:00
John Maguire
42361e0c0c adding support for wildcard ~ignore and ~unignore 2013-03-21 06:40:54 -04:00
John Maguire
af3a8bf1f2 adding support for ban/unban from ignore module, with wildcards 2013-03-21 06:39:57 -04:00
John Maguire
e90572aebf adding initial support for wildcard ignores/bans 2013-03-21 06:34:33 -04:00
John Maguire
ded2f09e87 fix error on "showconfig" with no paremeters (now shows root config) 2013-03-21 04:42:03 -04:00
John Maguire
42de44b4de supress error on joining channel, due to dbot attempting to get info on own join 2013-03-21 04:38:16 -04:00
John Maguire
fac4cb73b1 fixing ~rq error on empty quote db 2013-03-21 04:00:07 -04:00
John Maguire
4e6393dd9a don't allow whitespace-only categories for ~qadd 2013-03-21 03:42:13 -04:00
John Maguire
25b6099fbd fix error on ~rmlast when category doesn't exist 2013-03-21 03:41:53 -04:00
John Maguire
4a8e5d0cc0 fix error on ~link when web is misconfigured/not loaded 2013-03-21 03:41:27 -04:00
John Maguire
d87000f78d give users module proper usage info, subsequently fix empty params erroring 2013-03-21 02:58:40 -04:00
John Maguire
d9a03d03b6 fixing stylistic stuff on ~alias. should close reality/depressionbot#295 2013-03-21 02:07:49 -04:00
John Maguire
ffeb42dde3 removes the leading character on a NICK message, only if it's a : to deal with non-conforming IRCd's 2013-03-21 01:53:11 -04:00
John Maguire
6a968d5945 add ability to unload a module whose file has been deleted 2013-03-20 19:34:43 -04:00
John Maguire
53bc594552 adding a list of modules with help info to ~help command 2013-03-20 18:18:06 -04:00
John Maguire
163209afb9 adding some extra checks to ~help command to prevent errors 2013-03-20 17:47:01 -04:00
John Maguire
a2aef2cf00 url encoding quote category link 2013-03-18 22:50:59 -04:00
reality
46a0c7965b Merge branch 'master' of github.com:reality/depressionbot 2013-03-19 02:41:33 +00:00
reality
ad196eb865 bump github 2013-03-19 02:41:20 +00:00
John Maguire
1ab10dcb04 adding trim to link titles to remove annoying whitespace 2013-03-18 21:50:10 -04:00
reality
a77a569333 bum stats again 2013-03-18 00:17:04 +00:00
Douglas Gardner
24a955b2ab remove broken finger functionality 2013-03-17 19:55:47 +00:00
reality
4e1beb7580 Started working on transforming quotes. Need more input from evan and that before continuing I think. [#272] 2013-03-16 13:45:58 +00:00
reality
54e3b84902 Poll module now functional using databank. What of it? [#272] 2013-03-16 00:02:35 +00:00
reality
a5b65856a6 Merge git://github.com/reality/depressionbot into database 2013-03-15 23:12:30 +00:00
reality
7bb5cc722a update stats or something idk 2013-03-15 23:12:21 +00:00
reality
4bb9f90398 bump stats 2013-03-12 19:59:44 +00:00
reality
c507e62a41 Merge pull request #292 from xray7224/master 
More translations :)
 2013-03-12 12:53:12 -07:00
Thomas Menari
4b5bf08fe9 Add identica+twitter status fetching 2013-03-11 19:30:00 +00:00
Thomas Menari
5a6f6ad39e entity decoding for link module 2013-03-09 17:02:33 +00:00
reality
7bda956dbb Merge pull request #301 from zuzak/finger 
Finger: #297
 2013-03-06 08:27:35 -08:00
Douglas Gardner
9d277c7ac6 add hackish handling of non-existent users 2013-03-06 13:20:58 +00:00
Douglas Gardner
3cdf3fd417 add string functionality 2013-03-06 13:10:54 +00:00
Douglas Gardner
ab8e297769 add basic, hackish finger functionality 2013-03-06 13:02:02 +00:00
xray7224
f6d89defe7 ngari oel ngolop aylì'uti nìmun =] 2013-02-25 00:32:06 +00:00
reality
57977ac182 dont bother with titles if they are too long 2013-02-20 10:28:47 +00:00
reality
238e204d85 Fix [#286] 2013-02-16 18:06:58 +00:00
reality
07f8a129d5 provisional poll thing. only commiting so i can switch branch w/e [#272] 2013-02-16 17:37:23 +00:00
Luke Slater
5f8bde0db9 Merge pull request #285 from SamStudio8/master 
~link to use event input not params [Fix #273]
 2013-02-15 09:57:47 -08:00
Sam Nicholls
66611c92a3 ~link to use event input not params [Fix #273] 2013-02-15 17:28:54 +00:00
Luke Slater
957c8593b1 Merge pull request #274 from zuzak/langs 
begin transition from English to ISO-639
 2013-02-13 14:04:55 -08:00
Douglas Gardner
ea3338b2b9 fix dash 2013-02-12 21:10:52 +00:00
Douglas Gardner
9715d78964
convert hyphens to a more appropriate en-dash 2013-02-12 21:05:32 +00:00
Thomas Menari
ae12e319a6 show title for found song 2013-02-12 19:38:52 +00:00
Thomas Menari
a00a5dafed fix spotify search crash 2013-02-12 19:31:34 +00:00
Thomas Menari
9f007c906f spotify module 2013-02-12 19:14:27 +00:00
Douglas Gardner
a53eb5e0d2 begin transition from English to ISO-639 with #234 
This patch converts all English language strings used within
depressionbot's localisation interface (that is, strings.json) to their
ISO-639-1 equivalents.

The purpose of this patch is to make the strings.json file less
English-dependent.

All languages with an ISO-639-1 code have been converted; that is,
English, Spanish and Welsh, to ``en``, ``es`` and ``cy`` respectively.

This patch does not attempt to force a solution to the issue of Na'vi:
the language does not have a large enough corpus to warrant its own ISO
639-3 code, and as such there is no perfect solution. For the time
being, this patch keeps the Na'vi language as its English language
string ("Na'vi"). A possible solution to this discrepancy includes using
the ISO 639-3 code ``art``, used for artificial languages that do not
qualify for an official code, or by using local use codes specified
in ISO 639-3 (qaa to qtz).

This patch requires collaboration with upstream repositories that also
use strings.json, such as the Github and Stats modules.
 2013-02-12 18:39:15 +00:00
reality
22238f95d1 bump stats 2013-02-12 18:35:28 +00:00
reality
c79c595ee7 Remove object prototype extensions in master [#135] 2013-02-12 18:34:36 +00:00
reality
87387878a7 Merge branch 'master' of github.com:reality/depressionbot 2013-02-12 17:31:34 +00:00
reality
1b5c722c58 bump github 2013-02-12 17:31:13 +00:00
Sam Nicholls
532b1daaa6 Restrict version command to admin 2013-02-11 16:36:01 +00:00
Luke Slater
c6d3b5ccf4 Merge pull request #270 from dafrancis/master 
Delete Jesus from existance
 2013-02-11 08:15:35 -08:00
Dafydd Francis
7053b34bc4 Update modules/js/js.js 2013-02-11 16:12:44 +00:00
Luke Slater
c7a2b81e5e Merge pull request #76 from dafrancis/master 
#YOLO
 2013-02-11 05:21:43 -08:00
Luke Slater
4341cdc0fd Merge pull request #265 from zuzak/rain 
~rain module
 2013-02-10 12:57:47 -08:00
Joe MacMahon
8c828213d0 Added CTCP VERSION responding. New config option for version. 2013-02-09 16:44:05 +00:00
Douglas Gardner
f4a118db89 complete module 2013-02-07 16:47:05 +00:00
reality
c33d7b3720 derp 2013-02-05 19:26:29 +00:00
reality
8fcd19cca9 provisional api functionality for kicking and banning [#261] 2013-02-05 19:22:22 +00:00
Sam Nicholls
c813f6087c Fixed second new_user event misfire 2013-02-03 16:49:10 +00:00
Douglas Gardner
be80b185ed Merge remote branch 'upstream/master' into rain 2013-01-31 19:48:18 +00:00
Luke Slater
3bfc82c7bc remove unnecessary else 2013-01-31 18:53:58 +01:00
reality
a38f807f22 rebump jsbot and that 2013-01-31 17:47:52 +00:00
reality
d7c193cbe9 couple of formatting fixes + fix indentation [Close #258] 2013-01-31 17:46:15 +00:00
Daniel Dowling
4b7c2092b0 Added check for params[1] to ~xkcd 2013-01-31 17:20:51 +00:00
Daniel Dowling
451b7ea4d0 Cleaned up link slightly. 2013-01-31 15:53:45 +00:00
Daniel Dowling
bf2cff6eba Cleaned up code based on feedback. 2013-01-31 15:41:16 +00:00
Dafydd Francis
3f2bb2bde1 Just wanna post hashtags #yolo 2013-01-30 22:13:08 +00:00
Dafydd Francis
feb51aaceb Merge reality's stuff 2013-01-30 22:10:30 +00:00
Daniel Dowling
c3e569be41 Update modules/link/link.js 
Tab fix three: Revenge of the tabs
 2013-01-30 17:31:06 +00:00
Daniel Dowling
5f0bcd7710 Update modules/link/link.js 
Tab fix attempt 2
 2013-01-30 17:28:34 +00:00
Daniel Dowling
8d3d5d08a5 Update modules/link/link.js 
indent fix test
 2013-01-30 17:23:53 +00:00
Daniel Dowling
bcdca5d002 updated xkcd random to use dbot api instead of function call. 2013-01-30 17:18:07 +00:00
Daniel Dowling
67d7abbf84 fixed xkcd random and updated readme for link 2013-01-30 16:50:54 +00:00
Daniel Dowling
73e9b21824 added random xkcd function using "*" as the param 
Will get a random comic from http://dynamic.xkcd.com/random/comic/
Needs testing
 2013-01-30 14:19:52 +00:00
Douglas Gardner
178495bd69 WHY DOES THE RAIN GO DOWN NOT UP 2013-01-30 13:29:49 +00:00
Douglas Gardner
c9161c10ae it was raining cats and dogs; there were poodles all over the road 2013-01-30 12:43:17 +00:00
Douglas Gardner
0e9827a2fc further development was precipitated 2013-01-30 12:38:27 +00:00
Douglas Gardner
e1a8360b27 add api key to config 2013-01-30 12:27:08 +00:00
Douglas Gardner
251d69194b Update documentation; contract if statement 2013-01-30 12:21:46 +00:00
Douglas Gardner
0a63518b62 Add beginnings of a reworked ~isitraining 2013-01-30 12:12:10 +00:00
Luke Slater
eb7a958352 Don't pork up if UD is down 2013-01-30 09:56:56 +01:00
Douglas Gardner
4f24e6db4a update documentation 2013-01-30 01:39:50 +00:00
Douglas Gardner
e3074d8054 implement xkcd functionality 
The strings.json file is extensible; other fields that can be
placed in the xkcd string include the {year}, {month} and {day}
of the comic; the {alt} text; and links to the {img}.
A {transcript} is also available.
 2013-01-30 01:37:28 +00:00
reality
1a7825d8c6 bump github 2013-01-29 16:11:07 +00:00
reality
b9ad35b21f fix syntax 2013-01-29 15:05:34 +00:00
Jessica T
a8e8120a5c realityìri oel pamrel soli fì'ur mipa upxare leNa'vi 2013-01-29 14:47:37 +00:00
reality
c3c52692a6 Merge branch 'master' of github.com:reality/depressionbot 2013-01-29 00:53:54 +00:00
reality
c4a98c0df7 fix #249 2013-01-29 00:53:37 +00:00
Sam Nicholls
45d2bae004 Merge pull request #248 from SamStudio8/master 
Fixed new_user emit misfire
 2013-01-28 15:41:51 -08:00
Sam Nicholls
f7f9037e44 Fixed new_user emit misfire 2013-01-28 23:40:32 +00:00
reality
e587725322 Merge branch 'master' of github.com:reality/depressionbot 2013-01-28 01:53:23 +00:00
reality
fbd664668f bump stats 2013-01-28 01:44:10 +00:00
Luke Slater
b4fbc8d258 Merge pull request #238 from SamStudio8/master 
Profile onLoad to use own createProfile API [#220]
 2013-01-27 17:39:34 -08:00
Sam Nicholls
d123fa95c6 Profile onLoad to use own createProfile API [#220] 2013-01-28 01:38:36 +00:00
reality
b068f47475 bump stats 2013-01-28 01:02:33 +00:00
reality
cb149531a5 update github 2013-01-28 00:56:11 +00:00
reality
3112facd01 add zuzaks github module 2013-01-28 00:44:52 +00:00
reality
db4ea68bb9 bump statos 2013-01-28 00:42:34 +00:00
reality
dc82d0add0 bump stats 2013-01-27 23:42:09 +00:00
Luke Slater
760c57cb8c Merge pull request #237 from SamStudio8/master 
Testing rolling week [#216]
 2013-01-27 15:39:19 -08:00
Sam Nicholls
13e24bbdbb Testing rolling week [#216] 2013-01-27 23:37:35 +00:00
reality
a5cede8c92 remove timers.js [#170] 2013-01-27 20:52:11 +00:00
reality
aeea3fc269 Quotes rm stuff no longer uses timers.js [#170] 2013-01-27 20:33:27 +00:00
reality
d3c3c2a5c1 pushconfig command [#189] 2013-01-27 20:26:14 +00:00
reality
c353069213 syntax fix 2013-01-27 19:45:56 +00:00
reality
a670faab21 syntax fix 2013-01-27 19:44:38 +00:00
reality
74d8fd9f94 getConfig now figures out value, appropriate changes for [#189] 2013-01-27 17:53:50 +00:00
reality
4a64928fd6 ~ignorechannel and ~unignorechannel commands in [#190] 2013-01-27 17:18:38 +00:00
reality
eb62212626 Add check for channel ignorance in command execution logic [#190] 2013-01-27 16:48:14 +00:00
reality
27e24a8173 Fixes for [#232] 2013-01-27 15:19:56 +00:00
reality
bd75519047 callback fix for [#233] 2013-01-27 14:49:22 +00:00
reality
bd32a06276 Fix docs for [#233] 2013-01-27 14:39:23 +00:00
reality
4555e12eaa Fix quote interpol + no need to pass event [#230][#156] 2013-01-26 20:08:09 +00:00
reality
aa4a8b8527 users.api.getRandomChannelUser [#156] 2013-01-26 19:21:09 +00:00
reality
188d90f068 update statos 2013-01-26 18:53:41 +00:00
reality
023c689f65 Merge branch 'master' of github.com:reality/depressionbot 2013-01-26 18:51:27 +00:00
reality
e0cc4d0797 bump stats 2013-01-26 18:51:02 +00:00
Sam Nicholls
fdd8ed7a6f Prevent profile break on no-stats bug 2013-01-26 18:11:28 +00:00
Sam Nicholls
e798882420 Add ~profile command [Close #219] 2013-01-25 19:57:04 +00:00
Sam Nicholls
78e0e60083 Hook ~setaliasparent and ~mergeusers [Fix #218] 2013-01-25 15:13:12 +00:00
reality
bc124e50c5 merge tmenari 2013-01-25 00:46:25 +00:00
reality
9d5785d41e notes im just commiting for something else 2013-01-25 00:45:45 +00:00
reality
687f35d51c whoops 2013-01-25 00:41:35 +00:00
reality
4f01cc2958 sorry @samstudio8 ill clean it up 2013-01-25 00:40:42 +00:00
Thomas Menari
f03dfd9111 sort photos by primary 2013-01-25 00:30:09 +00:00
reality
6156de73b1 change test_setprop and test_setprop to not have test in them (or underscores) 2013-01-24 22:44:41 +00:00
Sam Nicholls
1979ab15b0 Initial channel activity 'graph' [#167][#184] 2013-01-24 22:17:56 +00:00
reality
6f73fde865 file existence checking for module property files and config.json [#163] 2013-01-24 21:35:00 +00:00
Luke Slater
2e620fea6f Merge pull request #206 from tmenari/master 
basic "yearbook" feature
 2013-01-24 12:52:32 -08:00
Thomas Menari
3c4974d5ef make more l33t 2013-01-24 19:39:28 +00:00
reality
447bcbabf8 users emit for new users 2013-01-24 19:29:13 +00:00
reality
e1c332daef dox 2013-01-24 19:11:22 +00:00
reality
9d21b90b34 update stats 2013-01-24 18:55:59 +00:00
reality
37f5583d31 event in users for nick rename 2013-01-24 18:55:28 +00:00
reality
4376989df4 event majigger as per [#205] 2013-01-24 18:03:14 +00:00
reality
656024d87b revert poll syntax error >.< 2013-01-24 10:08:05 +00:00
reality
2e8d25aea4 i am retard 2013-01-24 10:06:56 +00:00
reality
68f78cad9c ~ud regex and only use first response line [#197] 2013-01-24 10:05:50 +00:00
reality
77490bbda5 Merge branch 'upstream' of https://github.com/zuzak/depressionbot 2013-01-24 10:03:18 +00:00
Thomas Menari
278bc8b93c add initial yearbook feature 2013-01-24 01:02:50 +00:00
Sam Nicholls
9d87fb7b7d Merge pull request #204 from SamStudio8/master 
Check for channel not nicks [#201]
 2013-01-23 16:34:42 -08:00
Sam Nicholls
e2073f557c Check for channel not nick [#201] 2013-01-24 00:30:22 +00:00
Sam Nicholls
7df5d41f18 Merge pull request #203 from SamStudio8/master 
Oops [#201]
 2013-01-23 16:26:19 -08:00
Sam Nicholls
35c9975d44 Oops [#201] 2013-01-24 00:25:54 +00:00
Sam Nicholls
f4dcbd5506 Merge pull request #202 from SamStudio8/master 
Stop nicks property error [#201]
 2013-01-23 16:24:48 -08:00
Sam Nicholls
8be61b746d Stop nicks property error [#201] 2013-01-24 00:23:26 +00:00
Luke Slater
6b6907fe7b re-add ~quote syntax 2013-01-24 00:39:42 +01:00
Luke Slater
ba72fa9aad Merge pull request #200 from SamStudio8/master 
Profile move and merge API [Untested]
 2013-01-23 15:33:46 -08:00
Sam Nicholls
ed86f98427 Profile move and merge API [Untested] 2013-01-23 23:32:50 +00:00
reality
5767634f42 call stats rename on nick listener 2013-01-23 23:05:09 +00:00
Sam Nicholls
1d0a5cb8a5 Merge pull request #199 from SamStudio8/master 
Regex for ~test_setprop
 2013-01-23 14:55:47 -08:00
Sam Nicholls
2a59f20b60 Regex for ~test_setprop 2013-01-23 22:55:06 +00:00
reality
3584831f84 bump stats 2013-01-23 22:34:44 +00:00
Luke Slater
b7af2d02fe Merge pull request #196 from SamStudio8/master 
Basic Profiles, show "ago" string in userlists
 2013-01-23 14:34:15 -08:00
reality
045ff8b9f8 status command and some basic error storing in module load [#198] 2013-01-23 22:32:17 +00:00
Sam Nicholls
f3771240a3 Basic Profiles [#184] 2013-01-23 19:13:10 +00:00
Douglas Gardner
29899adfc0 remove one-word restriction on ~ud 
There's undoubtedly a better way to do this, but it works.
~ud now allows more than one word to be sent to UD's servers.
 2013-01-23 19:01:52 +00:00
reality
c77cb09f87 syntax error in quotes conf 2013-01-23 16:24:52 +00:00
reality
b12259643a sometimes i think i might be retarded 2013-01-23 16:12:08 +00:00
reality
ff6a296aea Merge branch 'master' of github.com:reality/depressionbot 2013-01-23 13:40:45 +00:00
reality
d7bbd57358 what a fool 2013-01-23 13:40:33 +00:00
Luke Slater
b0752f779b Get mogglington his pony maybe [#193] 2013-01-23 10:36:46 +01:00
reality
27e79641d5 revert web shit 2013-01-22 23:29:49 +00:00
reality
23d0a76c83 Merge branch 'master' of github.com:reality/depressionbot 2013-01-22 23:27:19 +00:00
reality
4f530e5bc6 fix db meltage. [#191] 2013-01-22 23:27:02 +00:00
Luke Slater
33e53df600 Merge pull request #195 from zuzak/master 
Update documentation
 2013-01-22 13:17:00 -08:00