| 
							
							
								 Valentin Lorentz | 5d301b653f | Merge remote-tracking branch 'origin/speed-up-2to3' into testing Conflicts:
	locales/fr.po
	plugins/Misc/plugin.py
	sandbox/check_trans.py
	src/i18n.py | 2014-02-02 22:28:19 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 4fe74ed397 | Merge branch 'aka-sqlite3' into speed-up-2to3 | 2014-02-02 22:15:43 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | fe57cdb4dc | ChannelStats & MessageParser & PluginDownloader & RSS & User: Update l10n-fr. | 2014-01-26 20:45:27 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 99a734323f | AutoMode & Factoids & Google & Math & Network & Seen & Status & Topic: Update l10n-fr. | 2014-01-26 20:45:27 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | a3dbece402 | All plugins: Update .pot files and rename Supybot-fr to Limnora in French translation files. | 2014-01-26 20:45:27 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 5cfa7828ea | ChannelStats & MessageParser & PluginDownloader & RSS & User: Update l10n-fr. | 2014-01-22 08:02:03 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | ca6ee1fcb1 | AutoMode & Factoids & Google & Math & Network & Seen & Status & Topic: Update l10n-fr. | 2014-01-21 22:41:11 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 8b06bd52f0 | All plugins: Update .pot files and rename Supybot-fr to Limnora in French translation files. | 2014-01-21 16:48:13 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 06fdaa792f | Continue accelerating the 2to3 step (remove fix_map). | 2014-01-21 10:57:38 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 2fda69b4d6 | Continue accelerating the 2to3 step (remove fix_raise). | 2014-01-20 15:43:55 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 4652c9ce51 | Start accelerating the 2to3 step (remove fix_apply, fix_buffer, fix_callable, fix_exec, fix_execfile, fix_exitfunc, fix_filter, fix_funcattrs, fix_future, fix_getcwdu, and fix_has_key). | 2014-01-20 14:49:47 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 5341df0254 | Google: *copy* the utils.web.defaultHeaders before adding items to it. | 2014-01-14 20:55:56 +00:00 |  | 
			
				
					| 
							
							
								 spline | be2ad1f11f | Google: Fix @calc. | 2013-11-29 16:09:37 +01:00 |  | 
			
				
					| 
							
							
								 Terje Hoås | 599f80ec5f | Google: Filter out [, before attempting to interpret Googles response as json. | 2013-09-25 10:20:43 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 40675ffdfa | Merge remote-tracking branch 'supybot/master' into testing Conflicts:
	plugins/Admin/plugin.py
	plugins/BadWords/config.py
	plugins/Filter/plugin.py
	plugins/Google/plugin.py
	plugins/Math/plugin.py
	plugins/Misc/plugin.py
	plugins/Note/plugin.py
	plugins/RSS/plugin.py
	plugins/Seen/test.py
	plugins/ShrinkUrl/config.py
	plugins/ShrinkUrl/plugin.py
	plugins/ShrinkUrl/test.py
	plugins/Status/plugin.py
	plugins/String/config.py
	plugins/String/plugin.py
	plugins/Time/plugin.py
	plugins/Todo/plugin.py
	plugins/Web/plugin.py
	plugins/__init__.py
	scripts/supybot-botchk
	setup.py
	src/__init__.py
	src/callbacks.py
	src/commands.py
	src/conf.py
	src/drivers/Socket.py
	src/ircdb.py
	src/irclib.py
	src/ircutils.py
	src/questions.py
	src/registry.py
	src/schedule.py
	src/test.py
	src/utils/file.py
	src/utils/gen.py
	src/utils/net.py
	src/utils/web.py
	src/world.py | 2013-08-24 11:28:29 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 3341cd15ba | Admin & Factoids & Google & Later & Misc & NickAuth & RSS & Seen & User & Web: Update messages.pot | 2013-07-25 11:39:06 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 2a8b8e78a0 | Google: Fix URL quoting. | 2013-07-19 09:11:08 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | b360871378 | Google: Fix previous commit. | 2013-05-30 13:16:36 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 6e8b7be0f1 | Google: Fix @calc. | 2013-05-30 13:13:19 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 6266d0f16f | Google: Remove plugins/Google/local/simplejson/ since it is not used. | 2013-05-29 14:48:20 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | a15dea55db | Google: Configurable base URL. Closes GH-64. | 2013-05-21 18:40:38 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 93ecc2424f | Google: Fix encoding issue. | 2013-05-13 14:18:22 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | f438d0a0c2 | AutoMode & Channel & Config & Google & Seen & ShrinkUrl & String: Update l10n-fr. | 2013-03-03 19:48:31 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 10fc03ab19 | Google: Fix snarfer with Python 3. | 2013-02-24 01:51:40 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 5a114aba2e | Google & ShrinkUrl: Fix issue with super() in custom config types if plugin is reloaded. | 2013-02-09 21:53:56 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 5b432a781e | Google: Restore @calc and @phonebook. | 2013-02-03 07:53:55 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 21c17b8248 | Google: Fix Python 3 compatibility of the @translate command. | 2013-02-01 17:12:03 +01:00 |  | 
			
				
					| 
							
							
								 nyuszika7h | b2fdf83496 | Google: Add translate command (needs testing) https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :)
Conflicts:
	plugins/Google/plugin.py | 2013-02-01 14:54:13 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 33048545ea | Revert "Google: Remove translate command since their API is gone" This reverts commit 304facd1672ee7f359f40e46b88f2bccfb1de65b.
Conflicts:
	plugins/Google/test.py | 2013-02-01 14:49:53 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 7e0d868db1 | Merge branch 'py3k-backport' into testing | 2013-01-06 16:46:29 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | df62ddad78 | Google: Fix encoding with Python 3. | 2013-01-06 16:46:21 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 3dba9088b0 | Merge remote-tracking branch 'supybot/master' into testing Conflicts:
	INSTALL
	plugins/ChannelLogger/README.txt
	plugins/ChannelStats/README.txt
	plugins/Google/plugin.py
	plugins/Google/test.py
	plugins/Plugin/test.py
	plugins/Web/test.py
	setup.py
	src/callbacks.py
	src/ircdb.py
	src/irclib.py
	src/utils/str.py
	test/test_irclib.py | 2013-01-01 21:11:24 +01:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 6cbc6a14dd | Rename all 'locale' directories to 'locales'. Firstly, these directories contains more than one locale. Secondly, it conflicts with the 'locale' python module. | 2012-12-26 15:43:35 +01:00 |  | 
			
				
					| 
							
							
								 Mika Suomalainen | bbb7a0cc3b | Google: update l10n-fi. | 2012-10-07 18:46:42 +03:00 |  | 
			
				
					| 
							
							
								 Mika Suomalainen | 9bc69cccaf | Google: update messages.pot | 2012-10-07 18:43:39 +03:00 |  | 
			
				
					| 
							
							
								 James McCoy | 748b76404f | Google: Use standard json module now that 2.6 is minimum Python version Signed-off-by: James McCoy <jamessan@users.sourceforge.net> | 2012-09-10 20:07:43 -04:00 |  | 
			
				
					| 
							
							
								 James McCoy | 6f925e5f7a | Google: Remove calc and phonebook commands Signed-off-by: James McCoy <jamessan@users.sourceforge.net> | 2012-09-05 23:04:10 -04:00 |  | 
			
				
					| 
							
							
								 James McCoy | 304facd167 | Google: Remove translate command since their API is gone Signed-off-by: James McCoy <jamessan@users.sourceforge.net> | 2012-09-05 22:51:11 -04:00 |  | 
			
				
					| 
							
							
								 James McCoy | 82ecf36fcd | Update my name/contact information Signed-off-by: James McCoy <jamessan@users.sourceforge.net> | 2012-09-01 10:16:48 -04:00 |  | 
			
				
					| 
							
							
								 nyuszika7h | de61bb6b93 | Google: Add translate command (needs testing) https://github.com/myano/jenni/blob/master/modules/translate.py
is where I got the idea from. Say thanks to sbp and yano too! :) | 2012-08-31 16:52:58 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 30f711b12f | Google: Prevent flooding when no matches are found. | 2012-08-26 07:37:40 +00:00 |  | 
			
				
					| 
							
							
								 Terje Hoås | e1adc011c3 | Google: Stop output when there are no result. | 2012-08-17 17:16:26 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 45bf9db03c | Merge branch 'py3k-backport' into testing This branch provides support of Python 3 via 2to3 (without dropping
Python 2 support). | 2012-08-08 21:46:29 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 978a702346 | Google: Use 'json' module and apply .decode() on data. | 2012-08-04 19:50:30 +02:00 |  | 
			
				
					| 
							
							
								 Mika Suomalainen | 8b89014d10 | Google: update l10n-fi. | 2012-08-04 15:48:12 +03:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | ef78c86974 | Add configuration variable supybot.reply.format.url. | 2012-07-31 13:12:33 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | d5f3e1844f | Google: Add supybot.plugins.Google.oneToOne. | 2012-07-30 14:57:52 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | ea21c7aff5 | Google: Fix l10n-fr | 2012-07-29 13:40:03 +00:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | 1bf8ab11c0 | Google & Network & PluginDownloader & RSS & ShrinkUrl & Topic & Unix: Update l10n-fr. | 2012-07-29 12:05:42 +02:00 |  | 
			
				
					| 
							
							
								 Valentin Lorentz | e4a1352e0a | Google & PluginDownloader & ShrinkUrl & Topic: Update messages.pot | 2012-07-29 11:56:52 +02:00 |  |