James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f4da1fc94c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into devel  
						
						 
						
						... 
						
						
						
						Conflicts:
	VERSION
	classes.py
	docs/faq.md
	example-conf.yml
	protocols/p10.py
	pylink
	world.py 
						
						
					 
					
						2017-08-05 22:11:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b456966dd3 
							
						 
					 
					
						
						
							
							relay: move ban-style and whitelist checks to earlier in get_supported_cmodes  
						
						 
						
						
						
						
					 
					
						2017-08-05 22:03:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							ffde2c6b32 
							
						 
					 
					
						
						
							
							relay: add in muteban relaying on InspIRCd and UnrealIRCd  
						
						 
						
						
						
						
					 
					
						2017-08-05 22:03:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							7db811f2dd 
							
						 
					 
					
						
						
							
							protocols: declare quiet extban support where applicable  
						
						 
						
						
						
						
					 
					
						2017-08-05 21:52:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b9a58670ef 
							
						 
					 
					
						
						
							
							relay: cleanup code flow in handle_mode  
						
						 
						
						
						
						
					 
					
						2017-08-05 21:13:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae22dc848 
							
						 
					 
					
						
						
							
							faq: add a note regarding  #497  (bans and modes blocking clientbot from relaying)  
						
						 
						
						... 
						
						
						
						This will be fixed more completely in the future. Thanks to @Ryan-Goldstein for reporting! 
						
						
					 
					
						2017-08-03 10:44:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							a0a295f7d2 
							
						 
					 
					
						
						
							
							Set Irc.aborted earlier in the disconnect loop  
						
						 
						
						... 
						
						
						
						This prevents plugins from getting really confused as we remove things. 
						
						
					 
					
						2017-08-03 10:22:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							0d5afd266f 
							
						 
					 
					
						
						
							
							Irc: stop extraneous queue threads when removing from world.networkobjects  
						
						 
						
						
						
						
					 
					
						2017-08-03 10:15:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							d734fc3280 
							
						 
					 
					
						
						
							
							servprotect: bump default conf up to 10 hits/10 seconds  
						
						 
						
						
						
						
					 
					
						2017-08-03 10:10:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							dcc171095f 
							
						 
					 
					
						
						
							
							example-conf: spacing & comment tweaks  
						
						 
						
						... 
						
						
						
						(cherry picked from commit a55f60c6dc7c02dcde42b43f751e8083593faeec)
Conflicts:
	example-conf.yml 
						
						
					 
					
						2017-08-03 09:57:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							a639efa93e 
							
						 
					 
					
						
						
							
							relay: allow overriding tag_nicks per network  
						
						 
						
						... 
						
						
						
						Closes  #494 .
(cherry picked from commit 1d6b692e1490e538f5c8d9c16542ff45feab1f9f)
Conflicts:
	example-conf.yml 
						
						
					 
					
						2017-08-03 09:55:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							e8efbb8e83 
							
						 
					 
					
						
						
							
							Merge branch 'master+example-conf-updates'  
						
						 
						
						
						
						
					 
					
						2017-08-03 09:54:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							819aab2248 
							
						 
					 
					
						
						
							
							example-conf: roughly sort the plugins' order by usefulness/popularity  
						
						 
						
						... 
						
						
						
						(cherry picked from commit b24eefc87375ff81a0218309931cc15c1aa91902) 
						
						
					 
					
						2017-08-03 09:51:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							13baef08c1 
							
						 
					 
					
						
						
							
							example-conf: roughly sort config options by usefulness  
						
						 
						
						... 
						
						
						
						Also, remove the example for the deprecated pylink:prefixes option.
(cherry picked from commit 1eb274342166bc11d1daa4b9880e7a3990f32df5)
Conflicts:
	example-conf.yml 
						
						
					 
					
						2017-08-03 09:50:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							7df19bae5f 
							
						 
					 
					
						
						
							
							example-conf: tweak whether some options are commented out by default or not  
						
						 
						
						... 
						
						
						
						(cherry picked from commit dbc1e80def928528e60969739f041f01779a250b) 
						
						
					 
					
						2017-08-03 09:49:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							4379ef68ef 
							
						 
					 
					
						
						
							
							Migrate coremods.permissions to snake case  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:24:23 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f15f27168a 
							
						 
					 
					
						
						
							
							services_support: log the reason as well when a service bot is killed  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:15:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							d42eb82b62 
							
						 
					 
					
						
						
							
							bots: remove obsolete "Admin-only" tags from command help  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:10:04 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							76b8932eeb 
							
						 
					 
					
						
						
							
							bots: remove duplicate nick_to_uid call  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:09:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							529d1d84be 
							
						 
					 
					
						
						
							
							opercmds: remove obsolete "Oper/admin only" tags from commands  
						
						 
						
						... 
						
						
						
						These have been long superseded by the permissions API. 
						
						
					 
					
						2017-08-02 22:06:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							a55f60c6dc 
							
						 
					 
					
						
						
							
							example-conf: spacing & comment tweaks  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:02:35 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b947afabd0 
							
						 
					 
					
						
						
							
							example-conf: reorder some config options  
						
						 
						
						
						
						
					 
					
						2017-08-02 22:02:23 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6b692e14 
							
						 
					 
					
						
						
							
							relay: allow overriding tag_nicks per network  
						
						 
						
						... 
						
						
						
						Closes  #494 . 
						
						
					 
					
						2017-08-02 21:57:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							def1c0bfd9 
							
						 
					 
					
						
						
							
							opercmds: use irc.reply() instead of irc.msg(source, ...)  
						
						 
						
						
						
						
					 
					
						2017-08-02 21:48:05 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							acceb4e714 
							
						 
					 
					
						
						
							
							opercmds: reword checkban docs  
						
						 
						
						
						
						
					 
					
						2017-08-02 21:45:20 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							bf495a0aae 
							
						 
					 
					
						
						
							
							opercmds.checkban: make maxresults configurable, up to a cap of 200  
						
						 
						
						
						
						
					 
					
						2017-08-02 21:44:17 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							981e6c508f 
							
						 
					 
					
						
						
							
							Move _check_nick_collision to NetworkCoreWithUtils  
						
						 
						
						... 
						
						
						
						This is useful for networks that emulate IRC as well, to prevent clashes between real clients and virtual ones. 
						
						
					 
					
						2017-07-31 20:58:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							47f3977554 
							
						 
					 
					
						
						
							
							Move NetworkCore.parse_protocol_command to IRCNetwork.parse_irc_command  
						
						 
						
						... 
						
						
						
						Also add a stub for handle_events. 
						
						
					 
					
						2017-07-31 11:09:08 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b9a5de16de 
							
						 
					 
					
						
						
							
							user-modes.csv: fix wrong names for sno_serverconnects, sno_stats  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:57:51 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							0a56ab662b 
							
						 
					 
					
						
						
							
							channel/user-modes.csv: add RFC1459 & ngIRCd columns  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:56:10 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							eae1425975 
							
						 
					 
					
						
						
							
							NetworkCore: remove nonexistent cmode +r from mode type definitions  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:43:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							9345f2549b 
							
						 
					 
					
						
						
							
							Merge branch 'master+faq-updates'  
						
						 
						
						... 
						
						
						
						Sync docs/faq.md with the 2.x (devel) branch. 
						
						
					 
					
						2017-07-31 00:34:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							7b281e4b04 
							
						 
					 
					
						
						
							
							faq: tweak wording  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 17a4bbea87686d814eb2292d0142f8a8fdf591b4) 
						
						
					 
					
						2017-07-31 00:33:34 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							381d96552b 
							
						 
					 
					
						
						
							
							faq: fix formatting in the connection troubleshooting guide  
						
						 
						
						... 
						
						
						
						(cherry picked from commit f1f8f91bd7b6097c962b047b5b644b0c6bb9632b) 
						
						
					 
					
						2017-07-31 00:33:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							5d000c9930 
							
						 
					 
					
						
						
							
							faq: add a section regarding  #463  (sporadic SSL-related errors)  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 99acd06e02f8543f8d9196fa63913f57fe42a9a8) 
						
						
					 
					
						2017-07-31 00:33:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							8e67017c81 
							
						 
					 
					
						
						
							
							faq: be slightly less excited  
						
						 
						
						... 
						
						
						
						(cherry picked from commit cc4890184cc00ebc736697cbe5609c7e14bf386c) 
						
						
					 
					
						2017-07-31 00:33:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							c9734cc0af 
							
						 
					 
					
						
						
							
							faq: add "Relay users are missing" section  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 0d9c53a4f401f74ad9fdc369ab0c065f53d6b948) 
						
						
					 
					
						2017-07-31 00:33:30 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b41234ad79 
							
						 
					 
					
						
						
							
							faq: add a troubleshooting guide for connection failures  
						
						 
						
						... 
						
						
						
						(cherry picked from commit bc5474a43a73a40303b6ba3a62c02825aa2a33c9) 
						
						
					 
					
						2017-07-31 00:33:29 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f18f7de9f7 
							
						 
					 
					
						
						
							
							faq: sort by subtopic  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 42ce9c83b5e6827cd1140ef4ff482248b78ccc11) 
						
						
					 
					
						2017-07-31 00:33:28 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							c16ca14fba 
							
						 
					 
					
						
						
							
							faq: reword "advantages over Janus" section  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 9dcc94129256e3d7f037514397fba11fc001d1e1) 
						
						
					 
					
						2017-07-31 00:33:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							54dab5f107 
							
						 
					 
					
						
						
							
							faq: remove obsolete note about clientbot support  
						
						 
						
						... 
						
						
						
						The answer is fairly obvious now, and it's even mentioned in the readme.
(cherry picked from commit 01dc2505e2c2aff9ca0a30a22bca63eed220287f) 
						
						
					 
					
						2017-07-31 00:33:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							bed40cc10a 
							
						 
					 
					
						
						
							
							faq: add point about maxnicklen misconfigurations and relay  
						
						 
						
						... 
						
						
						
						(cherry picked from commit c7f300357c12e6c1aac1cf7fd7e76a42aef5f447) 
						
						
					 
					
						2017-07-31 00:33:26 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							17a4bbea87 
							
						 
					 
					
						
						
							
							faq: tweak wording  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:29:11 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							f1f8f91bd7 
							
						 
					 
					
						
						
							
							ffaq: fix formatting in the connection troubleshooting guide  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:27:48 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							99acd06e02 
							
						 
					 
					
						
						
							
							faq: add a section regarding  #463  (sporadic SSL-related errors)  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:21:16 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4890184c 
							
						 
					 
					
						
						
							
							faq: be slightly less excited  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:19:26 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9c53a4f4 
							
						 
					 
					
						
						
							
							faq: add "Relay users are missing" section  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:06:19 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							bc5474a43a 
							
						 
					 
					
						
						
							
							faq: add a troubleshooting guide for connection failures  
						
						 
						
						
						
						
					 
					
						2017-07-31 00:01:07 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							b24eefc873 
							
						 
					 
					
						
						
							
							example-conf: roughly sort the plugins' order by usefulness/popularity  
						
						 
						
						
						
						
					 
					
						2017-07-30 23:44:27 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								James Lu 
							
						 
					 
					
						
						
						
						
							
						
						
							42ce9c83b5 
							
						 
					 
					
						
						
							
							faq: sort by subtopic  
						
						 
						
						
						
						
					 
					
						2017-07-30 23:42:23 +08:00