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

1080 Commits

Author SHA1 Message Date
reality
588ea41fb7 Show comment info for reddit module [#293] 2013-04-13 19:58:05 +00:00
reality
1dada50559 Add ability to get post information and write regex (unimplemented handler for comments currently) which handles all three Things [#293] 2013-04-13 19:20:02 +00:00
reality
49beccf849 fix syntax error in web 2013-04-13 18:38:53 +00:00
reality
a6ca9bb9c8 fix thing 2013-04-13 18:37:47 +00:00
reality
234e84010c fix for reddit data with www 2013-04-13 17:57:42 +00:00
reality
a881e60c81 Basic Reddit module which posts info about Reddit links posted in the channel [#293] 2013-04-13 16:54:48 +00:00
reality
8151122b80 oh, handler was checking existence of matches[2] for some stupid reason [Close #353] 2013-04-13 15:41:13 +00:00
reality
8a2dd076a4 show width/height of imgur image too [#350] 2013-04-13 15:33:43 +00:00
reality
0e2e6a60db Add links to existing docs in config.json files [#352] 2013-04-13 15:21:07 +00:00
reality
b31d26b912 make ~qmerge a moderator command [#347] 2013-04-13 14:59:50 +00:00
reality
3a567a35da Merge github.com:reality/depressionbot into database 
Conflicts:
	modules/poll/commands.js
	modules/quotes/commands.js
 2013-04-13 00:57:18 +00:00
reality
841ebc3f21 auto handlers for imgur links [#350] 2013-04-13 00:42:20 +00:00
reality
a9acaeaebd show info about ~ri images [#350] 2013-04-12 23:44:19 +00:00
reality
270ae138bf Initial API function for imgur detail getting [#350] 2013-04-12 23:27:31 +00:00
reality
677a820638 add web api function for getUrl instead of string in base, use externalAddress optional config key to define external behaviours [#264] 2013-04-12 22:53:45 +00:00
reality
d8342f4489 Actually fix [#335] 2013-04-12 22:38:00 +00:00
reality
aad0b5e372 Some cleanup of quotes module postdatabank [#331] Addition of addQuote API and updated places what use it [#349] 2013-04-12 22:30:45 +00:00
reality
f17f926a3b ~qsearch can search all categories with * [#331] 2013-04-12 21:52:46 +00:00
reality
b1f450a3e1 quotes listener operational 2013-04-12 21:16:56 +00:00
reality
b8a25062b5 Interpolated quotes revived and plugged into ~q. Also a event inspecific getQuote API function implemented. [#331] 2013-04-12 21:08:11 +00:00
reality
36254c9e03 Merge git://github.com/reality/depressionbot into database 2013-04-12 19:29:03 +00:00
reality
7ceba078e2 Empty quote category records are now removed [#331][#346] 2013-04-12 19:28:23 +00:00
reality
6134f97a97 spotify module uses addHandler [#344] also spaceinvader sort your bloody indentation out 2013-04-12 19:17:22 +00:00
reality
0f298bd061 Fix for the Identica bit by allowing a name argument to be passed [#344] 2013-04-12 19:11:55 +00:00
reality
5d30261770 Create addHandler API for link module and have dent use it. Removed its own listener. [#344] 2013-04-12 19:03:01 +00:00
reality
e667d95ca8 Return correct head info is related result term is given by UD [Close #341] 2013-04-12 18:33:49 +00:00
reality
3a33c2be04 option to notify voiced users with ~report [Close #348] 2013-04-12 18:31:02 +00:00
reality
5892bd83aa ~qmerge command [Close #347] 2013-04-12 18:20:39 +00:00
reality
0098b07670 ~qrename command to rename quote categories [Close #345] 2013-04-12 18:03:52 +00:00
reality
11dcaac44c last commit meant admin commands couldnt be run. will rethink later. 2013-04-12 17:59:51 +00:00
reality
38c18366a3 Stop command execution syntax running if line is not a command. Note [#337] was fixed a few commits ago too. 2013-04-12 17:42:11 +00:00
reality
58b58aa15f ~qadd uses only save rather than save|create [#331] 2013-04-12 17:33:13 +00:00
reality
23dace4257 update ignore to use save instead of save|create [#331] 2013-04-12 17:30:56 +00:00
reality
b376a8fa54 rewrote all of quotes commands because array shims just werent good enough [#331] 2013-04-12 00:38:51 +00:00
Niels Simenon
68cdf34cc3 Added multiple colors. 2013-04-11 23:57:42 +02:00
reality
6bae0f47bf ~ignorechannel and ~unignorechannel now databankerised. Fixed bug with not initialising chan ignores onLoad. Ignore now fully databankerised. [#331] 2013-04-11 21:21:12 +00:00
reality
96a339a8d4 cleanup 2013-04-11 20:17:48 +00:00
reality
65be2ebcb5 remove useless imports from ignore api 2013-04-11 20:17:14 +00:00
reality
223b20b598 * ~ban and ~unban now fully databankerised and tested [#331] 
* Refactored ~ignore and ~unignore
* Refactored API
* Command uses new ban/ignore APIs, removed its own isBanned
* Ignore is now aware of servers [#188]
 2013-04-11 20:12:29 +00:00
Matt Molyneaux
3d918414b8 Put the colon next to the name, moron 2013-04-11 20:33:33 +01:00
Matt Molyneaux
ee06dc634b I warned you about porn bro, I told you dog! 
I told you man

I TOLD you about porn!
 2013-04-11 20:25:18 +01:00
reality
9c38316483 Merge git://github.com/reality/depressionbot into database 2013-04-11 18:19:28 +00:00
reality
8cd703940f ~ri instead of ~randomimgur 2013-04-10 20:36:26 +00:00
reality
8f977f8923 faster and includes uppercase characters (which are apparently the larger images) 2013-04-10 20:14:54 +00:00
reality
d82108de83 imgur better 2013-04-10 20:08:04 +00:00
reality
88037de55e prevent returning deleted imgurs 2013-04-10 20:05:57 +00:00
reality
4fa870e34e Initial imgur module with ~randomimgur command 2013-04-10 19:43:11 +00:00
reality
53c8ca9672 Forgot to add ignore.api to last commit 2013-04-10 07:50:47 +00:00
reality
b56ac4164a isIgnoring now belongs in ignore.api, changes in command to reflect this. ~ignore now operational for commands. [#331] 2013-04-10 01:28:53 +00:00
reality
384fe3024a ~ignore and ~unignore commands working on data storage/modification and listener execution prevention [#331] 2013-04-10 00:32:30 +00:00
reality
5c48971034 Provisional onLoad and ~unignore for ignores module. Needs testing. [#331] 2013-04-09 23:16:40 +00:00
reality
9952e4583c Get user by UUID API function [#331] 2013-04-09 23:16:00 +00:00
reality
86492e3efb Merge git://github.com/reality/depressionbot into database 2013-04-09 22:55:35 +00:00
reality
6638dec85a remove = from flashy regex since all colours are one word anyway 2013-04-09 22:33:07 +00:00
reality
b038ecf63f no blank at end 2013-04-09 22:15:17 +00:00
reality
52d232a2e6 add more colours, automatic upper case and help output 2013-04-09 22:14:15 +00:00
reality
381a78e311 forgot event.reply (flashy) 2013-04-09 22:07:11 +00:00
reality
a129083826 input, not params (flashy) 2013-04-09 22:06:03 +00:00
reality
4d5fa04277 fix render to point to text proeprly 2013-04-09 15:30:56 +00:00
reality
694e1bf857 fix regex and add g and b colour codes 2013-04-09 15:28:56 +00:00
reality
cecfd781d6 Add provisional flashy module which doesnt work yet 2013-04-09 15:20:07 +00:00
reality
14e03313ec Provisional/example ~ignore functionality using databank [#331] 2013-04-09 00:10:08 +00:00
reality
05cd889a4e Don't dent new quote additions if it includes interpolation notation. 2013-04-08 23:51:28 +00:00
reality
4a27036307 fix #335 by making req limit higher 2013-04-05 13:30:47 +03:00
reality
c1224a8f2c Merge git://github.com/reality/depressionbot into database 2013-03-28 22:12:43 +00:00
Matt Molyneaux
141cab407d Remove ^A from ctcp actions 
I'll have my pony now.
 2013-03-28 21:20:41 +00:00
reality
3c225defee stop telling people to fuck off 2013-03-26 18:43:55 +01:00
reality
e9b4a9f112 give reasonable size limit [#332] 2013-03-25 18:26:13 +00:00
reality
6176dd5695 fix crash on too big of a request [Close #332] 2013-03-25 18:23:35 +00:00
reality
e7be2f6b87 users module now tracks current nick, appropriate output in ~alias 2013-03-25 13:55:47 +00:00
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