reality 
							
						 
					 
					
						
						
						
						
							
						
						
							8712216948 
							
						 
					 
					
						
						
							
							dat merge  
						
						
						
						
					 
					
						2013-04-20 10:51:39 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							75b160f161 
							
						 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2013-04-19 23:37:26 +00:00 
						 
				 
			
				
					
						
							
							
								Niels Simenon 
							
						 
					 
					
						
						
						
						
							
						
						
							ff52d7e6f1 
							
						 
					 
					
						
						
							
							Added Dutch translations.  
						
						
						
						
					 
					
						2013-04-20 00:05:46 +02: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							07f8a129d5 
							
						 
					 
					
						
						
							
							provisional poll thing. only commiting so i can switch branch w/e [ #272 ]  
						
						
						
						
					 
					
						2013-02-16 17:37:23 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							656024d87b 
							
						 
					 
					
						
						
							
							revert poll syntax error >.<  
						
						
						
						
					 
					
						2013-01-24 10:08:05 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							68f78cad9c 
							
						 
					 
					
						
						
							
							~ud regex and only use first response line [ #197 ]  
						
						
						
						
					 
					
						2013-01-24 10:05:50 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							4d01187346 
							
						 
					 
					
						
						
							
							Show voting options in ~pdesc [ #155 ]  
						
						
						
						
					 
					
						2013-01-21 19:30:06 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							1673c8846b 
							
						 
					 
					
						
						
							
							basic dependencies as per [ #85 ]  
						
						
						
						
					 
					
						2013-01-21 17:39:21 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							07656eddcd 
							
						 
					 
					
						
						
							
							hook for update poll nicks [ #158 ][ #166 ] also change mergeusers return api  
						
						
						
						
					 
					
						2013-01-20 20:22:27 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							f04621a5e9 
							
						 
					 
					
						
						
							
							poll uses knownUsers [ #158 ]  
						
						
						
						
					 
					
						2013-01-20 19:12:34 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							94363a6d8f 
							
						 
					 
					
						
						
							
							polls case insensitive [ #155 ]  
						
						
						
						
					 
					
						2013-01-19 13:34:42 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							1bd1b5aa56 
							
						 
					 
					
						
						
							
							remove useless crap from modules [ #136 ]  
						
						
						
						
					 
					
						2013-01-15 16:54:51 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							2e875e7434 
							
						 
					 
					
						
						
							
							update poll [ #131 ]  
						
						
						
						
					 
					
						2013-01-15 16:21:43 +00:00 
						 
				 
			
				
					
						
							
							
								reality 
							
						 
					 
					
						
						
						
						
							
						
						
							6b8b617e71 
							
						 
					 
					
						
						
							
							Underscorise poll. Unfortunately some stuff went missing in the switch-over. Whoops. Oh I also fixed it. [ #81 ]  
						
						
						
						
					 
					
						2013-01-12 23:31:53 +00: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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