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
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ab1ff5319
							
						
					 | 
					
						
						
							
							Help links added to config [#89]
						
						
						
						
						
						
					 | 
					
						2012-12-30 20:30:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								reality
							
						 
					 | 
					
						
						
						
						
							
						
						
							887e854012
							
						
					 | 
					
						
						
							
							Documentation for polls [#75]
						
						
						
						
						
						
					 | 
					
						2012-12-30 18:38:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Evans
							
						 
					 | 
					
						
						
						
						
							
						
						
							e544c909ec
							
						
					 | 
					
						
						
							
							Modularised web routes and views
						
						
						
						
						
						
					 | 
					
						2012-12-24 05:51:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Slater
							
						 
					 | 
					
						
						
						
						
							
						
						
							96312303f0
							
						
					 | 
					
						
						
							
							web config data now taken from dbot web config
						
						
						
						
						
						
					 | 
					
						2012-12-12 18:36:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Slater
							
						 
					 | 
					
						
						
						
						
							
						
						
							cae8a1fc7d
							
						
					 | 
					
						
						
							
							loaded strings and usage from the modules themselves in reloadModules. some other smaller changes. fixed the syntax of the usage json. careful though this dbot init may delete your database.
						
						
						
						
						
						
					 | 
					
						2012-12-11 20:06:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Slater
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd56a8a197
							
						
					 | 
					
						
						
							
							Added usage.json files for all modules
						
						
						
						
						
						
					 | 
					
						2012-12-11 16:53:34 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Slater
							
						 
					 | 
					
						
						
						
						
							
						
						
							34e377f385
							
						
					 | 
					
						
						
							
							moved poll strings
						
						
						
						
						
						
					 | 
					
						2012-12-11 16:37:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Slater
							
						 
					 | 
					
						
						
						
						
							
						
						
							b2ea634d8c
							
						
					 | 
					
						
						
							
							Move all the modules to their own directories
						
						
						
						
						
						
					 | 
					
						2012-12-11 16:04:52 +00:00 | 
					
					
						
						
							
							
							
						
					 |