1491 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sam Nicholls	7b265a208e	Merge pull request #226 from SamStudio8/master ... Fix Y-Ticks [#216]	2013-01-25 16:56:30 -08:00
Sam Nicholls	00f04a01a9	Fix Y-Ticks [#216]	2013-01-26 00:55:50 +00:00
Sam Nicholls	3e7dc4ef9a	Merge pull request #225 from SamStudio8/master ... Basic Y-Labels and Ticks [#216]	2013-01-25 16:52:28 -08:00
Sam Nicholls	f34283a62d	Basic Y-Labels and Ticks [#216]	2013-01-26 00:51:48 +00:00
Sam Nicholls	8da222b13a	Merge pull request #224 from SamStudio8/master ... X-Labels [#216]	2013-01-25 13:41:31 -08:00
Sam Nicholls	3db80f908f	X-Labels [#216]	2013-01-25 21:39:13 +00:00
Sam Nicholls	f9c0831233	Merge pull request #223 from SamStudio8/master ... Prevent profile breaking if no stats are returned [Fix #81]	2013-01-25 12:15:21 -08:00
Sam Nicholls	97b27e4d78	Prevent profile breaking if no stats are returned [Fix #81]	2013-01-25 20:14:44 +00:00
Sam Nicholls	9a74077b98	Merge pull request #222 from SamStudio8/master ... Add ~profile command [Close #219]	2013-01-25 11:57:42 -08: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
Sam Nicholls	55c490f50f	Return non-scaled value as title, idiot [#216]	2013-01-25 11:08:35 +00:00
Sam Nicholls	26a10513e0	d3.max domain [#216][Untested]	2013-01-25 11:05:40 +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	dff1e21921	Merge branch 'master' of github.com:reality/depressionbot	2013-01-25 00:40:55 +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
Thomas Menari	bb45ef5e3c	Merge git://github.com/reality/depressionbot	2013-01-24 23:26:33 +00:00
Thomas Menari	1c0e258c58	placeholder deserves img-polaroid too	2013-01-24 23:26:23 +00:00
Luke Slater	01f17be4d8	Merge pull request #213 from tmenari/master ... wrap long nicks on the web interface	2013-01-24 15:16:26 -08:00
Thomas Menari	b0db605174	wrap long nicks	2013-01-24 23:14:41 +00:00
Luke Slater	097eeed764	Merge pull request #212 from tmenari/master ... img-polaroid is super cool	2013-01-24 15:05:47 -08:00
Thomas Menari	8cd16c3296	prettier bio picture	2013-01-24 22:53:23 +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
Luke Slater	9c7006a983	Merge pull request #211 from tmenari/master ... masonry.js, again	2013-01-24 14:39:49 -08:00
Thomas Menari	6830ed73e1	Merge git://github.com/reality/depressionbot	2013-01-24 22:38:34 +00:00
Thomas Menari	17fb0cc53c	derp	2013-01-24 22:35:35 +00:00
Thomas Menari	114b0fd09c	derp	2013-01-24 22:34:34 +00:00
Sam Nicholls	5e0dc01a05	Merge pull request #210 from SamStudio8/master ... Back link to Connections from Profile Grid	2013-01-24 14:31:38 -08:00
Sam Nicholls	5796aed13e	Back link to Connections	2013-01-24 22:30:52 +00:00
Luke Slater	c28e9c9d17	Merge pull request #209 from SamStudio8/master ... Initial channel activity 'graph' [#167][#184]	2013-01-24 14:19:20 -08:00
Sam Nicholls	1979ab15b0	Initial channel activity 'graph' [#167][#184]	2013-01-24 22:17:56 +00:00
Sam Nicholls	7e1505fc24	Merge pull request #208 from SamStudio8/master ... Moved back link on profile	2013-01-24 14:08:24 -08:00
Sam Nicholls	76ed899917	Moved back link on profile	2013-01-24 22:07:43 +00:00
reality	6e65d6bdb6	Merge branch 'master' of github.com:reality/depressionbot	2013-01-24 21:53:33 +00:00
reality	18a079c4be	error reporting in status for properties [#198]	2013-01-24 21:53:24 +00:00
Thomas Menari	3cad0ea3c7	Remove columnwidth	2013-01-24 21:52:38 +00:00
Luke Slater	d5a1a0bdd6	Merge pull request #207 from tmenari/master ... masonry.js	2013-01-24 13:52:20 -08:00
Thomas Menari	9f72be10d1	hotlink masonry	2013-01-24 21:49:16 +00:00
Thomas Menari	3138bc8367	masonry	2013-01-24 21:46:42 +00:00
reality	e9480b6f64	put onLoad in try/catch, add status message for failure. [#198]	2013-01-24 21:46:18 +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
reality	c1aa8db815	fix db loading logic and check the file exists before attempting to load [#163]	2013-01-24 20:51:38 +00: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