Commit Graph

1142 Commits

Author SHA1 Message Date
Luke Slater
00deda35f9 Merge pull request #279 from zuzak/dash
convert hyphens to a more appropriate en-dash
2013-02-13 14:03:35 -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
Luke Slater
d4f69eb54f Merge pull request #278 from tmenari/master
[spotify] show title when searching
2013-02-12 11:46:20 -08:00
Thomas Menari
ae12e319a6 show title for found song 2013-02-12 19:38:52 +00:00
Luke Slater
80f8b95a06 Merge pull request #277 from tmenari/master
fix spotify search crash
2013-02-12 11:33:11 -08:00
Thomas Menari
a00a5dafed fix spotify search crash 2013-02-12 19:31:34 +00:00
Luke Slater
bcf2fd8f42 Merge pull request #275 from tmenari/master
my spotify module
2013-02-12 11:18:20 -08:00
Thomas Menari
9f007c906f spotify module 2013-02-12 19:14:27 +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
77138d922e bump jsbot! 2013-02-12 17:35:55 +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
reality
d2896797aa change std version 2013-02-09 19:48:52 +00: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
reality
b02fe22d02 Merge branch 'master' of https://github.com/WelshMullet/depressionbot 2013-01-31 17:40:40 +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
reality
63943ca2dc Merge branch 'master' of https://github.com/WelshMullet/depressionbot 2013-01-31 12:58:18 +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
5a83e78820 Reverted file 2013-01-30 17:04:27 +00:00
Daniel Dowling
67d7abbf84 fixed xkcd random and updated readme for link 2013-01-30 16:50:54 +00:00
Luke Slater
d7ce42d04c Merge pull request #255 from zuzak/upstream
Further automate the install script
2013-01-30 07:07:43 -08:00
Douglas Gardner
a130c3e744 Further automate the install script
* config.json is now created in the correct location
* config.json is only created if it doesn't already exist
* vim launches to edit config.json on first install
* User is prompted to run depressionbot directly from the script
2013-01-30 15:01:16 +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