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

872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
reality
4c3887aa02 Merge branch 'master' of github.com:reality/depressionbot 2013-01-07 12:27:35 +00:00
reality
6c7e56be1a load pages from closer in u/web.js 2013-01-07 12:27:24 +00:00
Luke Slater
bb30545322 Merge pull request #110 from SamStudio8/master 
Update stats to v0.1
 2013-01-07 01:12:35 -08:00
Sam Nicholls
94a28e29f1 Update stats 2013-01-06 13:32:48 +00:00
Luke Slater
f25af00e93 Merge pull request #109 from SamStudio8/master 
Report version after greload callbacks complete
 2013-01-05 14:25:20 -08:00
Sam Nicholls
ddc538b6a0 Report version after greload callbacks complete 2013-01-05 22:20:09 +00:00
Sam Nicholls
b7ac12ecc2 Merge pull request #108 from SamStudio8/master 
version command [Close #96]
 2013-01-05 14:06:37 -08:00
Sam Nicholls
7caa659017 version command [Close #96] 2013-01-05 22:04:59 +00:00
reality
1785b89df0 Store channel users as per [#106] 2013-01-05 19:08:17 +00:00
reality
5429740eef add ignores to dbkeys in command so no fail if theres no ignore loaded 2013-01-05 18:53:27 +00:00
Luke Slater
bbe6a540be Update modules/link/link.js 
no title found shut up omg
 2013-01-05 17:00:45 +01:00
Luke Slater
c22b7a24da Update config.json.sample 2013-01-05 16:43:22 +01:00
reality
91ba685401 fix express close for 3.0. you could document your shit guys 2013-01-05 01:36:36 +00:00
reality
aa39fd7d4c update stats 2013-01-05 00:51:20 +00:00
reality
feee9784b6 Merge branch 'master' of github.com:reality/depressionbot 2013-01-05 00:22:19 +00:00
reality
49e5648519 update stats 2013-01-05 00:22:06 +00:00
Luke Slater
441ede1602 Merge pull request #104 from danharibo/weboverhaul 
Update views/users/connections.jade
 2013-01-04 14:33:03 -08:00
Daniel Evans
046411f2c3 Update views/users/connections.jade 2013-01-04 21:43:40 +00:00
Luke Slater
46979dd32c Merge pull request #103 from danharibo/weboverhaul 
Updated web module for Express 3.0.x
 2013-01-04 13:26:54 -08:00
Daniel Evans
2e9535bba1 Updated web module for Express 3.0.x 2013-01-04 21:26:11 +00:00
Luke Slater
98fbad6af5 Merge pull request #102 from danharibo/weboverhaul 
Restored deprecated express usage for testing
 2013-01-04 12:52:22 -08:00
Daniel Evans
1d26789a97 Restored deprecated express usage 2013-01-04 20:50:26 +00:00
reality
e41cd64d50 Merge branch 'master' of github.com:reality/depressionbot 2013-01-04 20:31:51 +00:00
Luke Slater
585ad0fdd0 Merge pull request #101 from danharibo/weboverhaul 
Weboverhaul
 2013-01-04 12:30:55 -08:00
Daniel Evans
f91fc99d35 Merge branch 'master' of git://github.com/reality/depressionbot into weboverhaul 
Conflicts:
	modules/quotes/quotes.js
	modules/users/users.js
	run.js
 2013-01-04 20:15:12 +00:00
reality
b636589014 update jsbot 2013-01-04 19:47:33 +00:00
reality
c5b489fd9d wat 2013-01-04 18:12:33 +00:00
reality
958c438a45 lowercase flag in resolveUser 2013-01-04 17:58:35 +00:00
Luke Slater
c1c8ffca69 Update modules/users/users.js 
call api fixStats
 2013-01-04 18:04:09 +01:00
reality
b50f4d25b8 greload updates submodules [#100] 2013-01-04 16:13:45 +00:00
Sam Nicholls
e9c4be17a1 Merge pull request #99 from SamStudio8/master 
Update stats
 2013-01-04 06:29:19 -08:00
Sam Nicholls
fab7917921 Update stats 2013-01-04 14:27:39 +00:00
reality
49528bb434 Made a getQuote API function [#98] 2013-01-03 21:27:06 +00:00
reality
078379b5f1 API functionality as per [#98] 
* Also resolveUser api function in user module [#98]
 2013-01-03 19:56:30 +00:00
reality
99909e2dc5 update stats 2013-01-03 03:05:35 +00:00
reality
a34946e548 update stats 2013-01-03 01:22:49 +00:00
reality
8ea910ee10 update stats 2013-01-03 01:08:08 +00:00
Sam Nicholls
62d3af17e1 Stats 2013-01-02 23:48:04 +00:00
reality
9a26c6bd74 whatever 2013-01-02 23:36:29 +00:00
reality
23ee0f3a8e One does not even 2013-01-02 23:34:40 +00:00
reality
f59af39c94 update stats SAM 2013-01-02 22:54:37 +00:00
reality
4f49c13c9c update stats 2013-01-02 22:34:29 +00:00
reality
7954f4e080 i am a retard 2013-01-02 22:08:31 +00:00
reality
f1d30c9df2 fix replace user entry 2013-01-02 21:58:52 +00:00
reality
97d9869f4d update stats 2013-01-02 21:50:45 +00:00
reality
b4e4338148 ~mergeusers command [#94] 2013-01-02 21:06:43 +00:00
reality
f537b05493 update stats 2013-01-02 19:12:58 +00:00
reality
51298b8362 Enhancements to ~alias as per [#95] 2013-01-02 19:00:44 +00:00
reality
67b2661e63 Merge branch 'master' of github.com:reality/depressionbot 2012-12-31 15:38:57 +00:00
reality
e044ec5d14 Finish off module docs [#75 2012-12-31 15:37:49 +00:00