Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-18 16:12:42 +01:00
Code Issues Projects Releases Wiki Activity
9,484 Commits 3 Branches 126 Tags 40 MiB
98482f0826
Commit Graph

4741 Commits

Author SHA1 Message Date
Valentin Lorentz
f438d0a0c2 AutoMode & Channel & Config & Google & Seen & ShrinkUrl & String: Update l10n-fr. 2013-03-03 19:48:31 +01:00
Valentin Lorentz
693e827340 Alias & ChannelLogger & MessageParser & MoobotFactoids & User & Web: Update l10n-fr. 2013-03-02 19:15:12 +01:00
Valentin Lorentz
2cfe1f9d78 PluginDownloader: Add jonimoose's repository. 2013-02-27 21:46:43 +00:00
Valentin Lorentz
10fc03ab19 Google: Fix snarfer with Python 3. 2013-02-24 01:51:40 +01:00
Valentin Lorentz
c3f2bfdfc9 Fix previous commit. Thanks to Nothing4You. 2013-02-22 19:22:23 +01:00
Valentin Lorentz
cb48f667ae MessageParser: Prevent duplicated response if supybot.databases.plugins.channelspecific is enabled. 2013-02-22 18:40:38 +01:00
Valentin Lorentz
48b03a8f46 Merge branch 'testing' of github.com:ProgVal/Limnoria into testing 2013-02-22 18:31:12 +01:00
Valentin Lorentz
42f5b02d30 MessageParser: Order @list output with id, instead of random order. 2013-02-22 18:30:48 +01:00
Valentin Lorentz
4069b2eba1 MessageParser: Add supybot.MessageParser.maxTriggers variable. 2013-02-22 18:27:10 +01:00
Valentin Lorentz
b6c62b617a Math: Fix l10n-fr. 2013-02-21 17:52:09 +00: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 304facd167.

Conflicts:
	plugins/Google/test.py
 2013-02-01 14:49:53 +00:00
Valentin Lorentz
f880d5b6ef RSS: Fix typo. 2013-01-23 16:32:23 +01:00
Valentin Lorentz
c9b6b56244 Utilities: Fix encoding in tests. 2013-01-21 21:09:50 +01:00
Valentin Lorentz
bbe65a39a6 Utilities: Add tests for unicode characters. 2013-01-21 20:20:26 +01:00
Valentin Lorentz
97bffbdef1 User: Add support for authentication via GPG. 2013-01-20 00:09:37 +01:00
Valentin Lorentz
06aca4bda8 PluginDownloader: Add frumious's repo. 2013-01-19 18:54:48 +01:00
Valentin Lorentz
bbd9d1636a Math: Fix rounding. 2013-01-11 19:44:21 +01:00
Valentin Lorentz
0ff58db4f0 Math: Fix tests to allow higher precision. 2013-01-11 18:15:02 +01:00
Valentin Lorentz
ea63da3e7d Math: As unit conversion algorithm fails with high precision, make significant digits matter. 2013-01-11 18:14:11 +01:00
Valentin Lorentz
caa36121a7 ShrinkUrl: Add ur1.ca support. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2013-01-08 22:54:02 -05:00
Joe Julian
a8e3081b18 ShrinkUrl: Support for goo.gl url shortener. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2013-01-08 22:44:35 -05:00
Terje Hoås
2327317b33 Web: Fix fetch. Use getUrl instead of getUrlFd. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2013-01-08 20:32:43 -05:00
Valentin Lorentz
018ee3456d ShrinkUrl: Retry shrinking twice if it fails. 2013-01-07 20:22:23 +01:00
Valentin Lorentz
589d55ebcd NickAuth: Use assertEqual for string comparison in tests ('foo' is not 'foo' with Pypy). 2013-01-07 17:15:17 +01:00
Valentin Lorentz
add5e07d97 Dict: Fix encoding. 2013-01-06 19:54:04 +01:00
Valentin Lorentz
603f44129d Web: Fix Python 3 compatibility. 2013-01-06 17:06:26 +01:00
Valentin Lorentz
8a8f380a6b Internet: Fix Python 3 compatibility. 2013-01-06 16:58:02 +01:00
Valentin Lorentz
418b3e007c Filter: Fix encoding with Python 3. 2013-01-06 16:53:07 +01: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
139cb39ec5 MoobotFactoids: Fix tests with fastest computers. 2013-01-05 21:12:16 +01:00
Valentin Lorentz
fdb7a764d4 core & Filter & Owner: Fix Python 2.6 compatibibility. 2013-01-05 20:51:36 +01:00
Valentin Lorentz
b7b60630d8 Owner: Skip test of @rename for nested commands. 2013-01-05 20:32:39 +01:00
Valentin Lorentz
f44e033827 MoobotFactoids: Prevent race condition in tests (for fastest computers). 2013-01-05 20:19:59 +01:00
Valentin Lorentz
be3017f1de Filter: Fix encoding issues in tests. 2013-01-05 20:05:36 +01:00
Valentin Lorentz
6e452e0496 Filter: Fix @rot13 with non-ascii strings. 2013-01-05 20:05:22 +01:00
Valentin Lorentz
422dfc3679 PluginDownloader: Rename gsf to code4lib (upstream change). 2013-01-05 19:20:35 +01:00
Valentin Lorentz
775a1a2cde PluginDownloader: Remove gsf tests (too long). 2013-01-05 19:20:03 +01:00
Valentin Lorentz
2177429618 Web: Remove netcraft (which does not seem to want bots). 2013-01-05 19:14:58 +01:00
Valentin Lorentz
63a4285941 MoobotFactoids: Add count of recent/top factoids (removed while internationalizing). 2013-01-05 19:13:37 +01:00
Valentin Lorentz
5afff1c0d6 MoobotFactoids: Fix encoding issue in tests. 2013-01-05 19:09:46 +01:00
Valentin Lorentz
db48d78050 Internet: Fix whois of domains whose whois server is too lazy to close a connection. 2013-01-05 18:46:56 +01:00
Valentin Lorentz
10197b9956 Internet: Fix whois on .com domains (if too many domains matched). 2013-01-05 18:20:52 +01:00
Valentin Lorentz
dd74982969 Internet: Remove test which fails if it is run too much ('WHOIS LIMIT EXCEEDED'). 2013-01-05 18:20:32 +01:00
Valentin Lorentz
5f1d7cc097 Web: Fix test of snarfing (Microsoft changes the title based on location of the computer). 2013-01-05 18:03:13 +01:00
Valentin Lorentz
918092a54d Web: Fix snarfing of titles with UTF-8 characters. 2013-01-05 18:02:35 +01:00
Valentin Lorentz
a11cb6478a ChannelStats: Fix tests. 2013-01-04 23:03:00 +01:00
Valentin Lorentz
4c23fae4d3 ShrinkUrl: Fix tests. 2013-01-04 22:56:12 +01:00
Valentin Lorentz
e86768b61a Misc: Fix testTell. 2013-01-04 22:01:36 +01:00
Valentin Lorentz
1132728656 Merge branch 'testing' of github.com:ProgVal/Limnoria into testing 2013-01-01 21:12:38 +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
TheLordOfTime
417182c15a Conditional: Add description about plugin to init 
Fixes the issue in supybot-wizard which shows this type of output:

What plugin would you like to look at? [.../Conditional/...] Conditional


Add a description of the plugin (to be presented to the user inside the wizard)
here.  This should describe *what* the plugin does.


 Would you like to load this plugin? [y/n] (default: y)
 2012-12-31 11:34:07 -05:00
Valentin Lorentz
499d68f73a Channel: Remove debug output. 2012-12-26 20:53:49 +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
Valentin Lorentz
84148988b3 Fix tests broken by 6a06ca991. 2012-12-26 15:37:52 +01:00
Valentin Lorentz
bcde88ab4d Channel: Add --all parameter to @unban. 2012-12-23 17:28:36 +01:00
Valentin Lorentz
c46602d3f2 Channel: Implement @listbans. 2012-12-23 17:19:29 +01:00
Valentin Lorentz
0607462dd5 PluginDownloader: Add error messages to assertion errors. 2012-12-19 16:55:54 +00:00
Valentin Lorentz
46a25b913c PluginDownload: Output more detailed error log. 2012-12-19 16:43:14 +00:00
Daniel Folkinshteyn
f6209a90c2 String: cap maximum soundex length to 1024. 2012-12-17 06:30:04 +01:00
Daniel Folkinshteyn
5d6a3c5a46 String: cap maximum soundex length to 1024. 2012-12-16 23:53:13 -05:00
Valentin Lorentz
cead634055 PluginDownloader: Fix tests. 2012-12-12 19:24:49 +01:00
Valentin Lorentz
f19eb060f3 ChannelStats: Fix tests. 2012-12-12 19:24:39 +01:00
Valentin Lorentz
943f3a0133 Web: Fix test for @title. 2012-12-12 19:24:23 +01:00
Valentin Lorentz
ad3f58efc2 Add the content of the new value of a config var, when it is not compatible with this config type. 2012-12-12 18:47:03 +01:00
Valentin Lorentz
3063340ce3 Channel: Make use of the context() method of registry.Value objects. 2012-12-08 20:05:53 +01:00
Valentin Lorentz
8d8e574d12 Owner: fix error message when the ImportError comes from the plugin 2012-12-02 20:35:52 -05:00
Valentin Lorentz
93586d71f4 Add support for extended banmasks. Closes GH-105. 2012-12-02 19:04:48 +01:00
Valentin Lorentz
650cbe548a Channel: Prevent @iban from adding wildcard when an exact banmask is given. 2012-12-02 18:50:41 +01:00
Valentin Lorentz
22febc4a20 Web: Fix encoding issues in title snarfing and @title. 2012-11-17 15:10:36 +00:00
Valentin Lorentz
28cdbaf021 Config: Fix previous commit. 2012-11-09 22:40:10 +00:00
Valentin Lorentz
216df3d472 Config: Rename @reset to @setdefault (reset is a method implemented by the core). 2012-11-09 22:32:01 +00:00
Valentin Lorentz
5de01bd222 Merge pull request #424 from Mkaysi/nickauth-l10n-fi 
NickAuth: add messages.pot & l10n-fi.
 2012-11-07 07:50:40 -08:00
Erika Mustermann
0cd7bd857a Added @reset command per request issue #163 2012-11-07 04:20:03 +00:00
Valentin Lorentz
992de0962b Misc: Update @version to use new display format of dates in Github API. 2012-11-05 15:44:22 +00:00
Daniel Folkinshteyn
3c30463e11 Math: default %f formatting rounds to 6 decimal places. increase that to 16. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-11-04 19:48:53 -05:00
Valentin Lorentz
72b1d4f3de NickAuth: Copy plugin.py's description to __init__.py. Closes GH-425. 2012-11-04 14:25:11 +00:00
Mika Suomalainen
fef5ed367f NickAuth: add l10n-fi. 2012-11-04 11:28:16 +02:00
Mika Suomalainen
18348276f8 NickAuth: add messages.pot 2012-11-04 11:11:17 +02:00
Valentin Lorentz
659f6ebceb NickAuth: First commit. 2012-11-03 23:06:57 +01:00
Valentin Lorentz
6ea2d062b7 Web: Filter special chars in @title, and add --no-filter. 
I'm adding --no-filter just in case someone want to use @title to do this at purpose
 2012-10-31 16:35:51 +00:00
Daniel Folkinshteyn
c68afacc0f Math: calc: coerce argument to ascii string. working with unicode errors on the translate() step. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-30 19:09:45 -04:00
Mika Suomalainen
ca8a829689 User: update l10n-fi & messages.pot 2012-10-30 17:42:24 +02:00
Valentin Lorentz
fba70d15bc Add configuration variable conf.supybot.capabilities.private. 
This variable is a list of capabilities that are considered as 'private',
ie. the bot won't tell anyone but admins that a user has it, nor will the
bot give a list of users with this capability.
 2012-10-29 20:15:14 +01:00
Valentin Lorentz
88b2b235ff User: Add tests for @user list --capability. 2012-10-29 19:28:59 +01:00
Valentin Lorentz
484d7e6fac Misc: Notify the caller when @tell succeeded. Closes GH-97. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-24 17:36:21 -04:00
Valentin Lorentz
9b8397193b Admin: Add clearq command. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-24 01:45:38 -04:00
James McCoy
b5eac0994a Call unqualified process/regexp_wrapper, since commands exports them now. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-24 00:26:51 -04:00
James McCoy
57e429011d Misc: Use regexp_wrapper for Misc.last 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-24 00:24:16 -04:00
Valentin Lorentz
d05506ee22 Seen: Add supybot.plugins.Seen.minimumNonWildcard. 2012-10-23 16:34:38 +00:00
Valentin Lorentz
32b0b12c1f Seen: Fix tests. 2012-10-23 16:30:28 +00:00
Daniel Folkinshteyn
40bdec92ca Math: calc: coerce argument to ascii string. working with unicode errors on the translate() step. 2012-10-22 11:24:28 -04:00
Daniel Folkinshteyn
18ec61842c Secure some more commands which take a regexp from untrusted user input. 
Namely todo.search, note.search, dunno.search.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-20 15:06:43 -04:00
Daniel Folkinshteyn
ac500b059a String: set default re subprocess timeout to 0.1, since that should be quite enough. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-20 14:56:30 -04:00
Daniel Folkinshteyn
9356d0734f Misc: fix potential ddos when misc.last command is fed a specially-crafted regexp. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-20 14:56:11 -04:00
Daniel Folkinshteyn
72c5c8ec09 String: fix it up to work with the previously committed enhancement for subprocess timeout. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-20 14:47:16 -04:00
Valentin Lorentz
a565b7f7d7 MessageParser: Add support for global triggers. 2012-10-18 19:31:08 +02:00
Daniel Folkinshteyn
f310350335 Web: add 'timeout' config for web fetch, default 5 sec. 
Otherwise, when a site would take a long time to respond, the thread would hang for quite a while.

also needed to mod src/utils/web.py to take the timeout arg.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:10:56 -04:00
Daniel Folkinshteyn
ce9891368b Seen: fix tests so they pass. fix seen command so it properly accepts nick wildcards. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:09:34 -04:00
Valentin Lorentz
8ded033410 Seen: Fix save Seen.any.db. (thanks to beo_ for the repport and the test) 
Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:06:49 -04:00
Daniel Folkinshteyn
854e086fa7 Topic: get shouldn't require capabilities, since it's a read-only operation. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:04:35 -04:00
Daniel Folkinshteyn
02b9431536 BadWords: improve help for requireWordBoundaries config. 
Make a note that the plugin requires restart or the words set updating,
for changes to this setting to take effect.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:01:39 -04:00
Daniel Folkinshteyn
011d4dd676 Badwords: add plugin docstring, and fix/standardize some method docstrings. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 22:00:08 -04:00
Daniel Folkinshteyn
92be7c255f String: make levenshtein command threaded, since it can take a nontrivial amount of time with longer inputs. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:49:15 -04:00
Daniel Folkinshteyn
34e5aedc45 String: make re timeout configurable. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:47:32 -04:00
Daniel Folkinshteyn
7504c646b7 Status.processes: add output of currently active processes. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:35:26 -04:00
Daniel Folkinshteyn
7f4a1be9f9 Status: add 'processes' command, the multiprocessing equivalent of the threads command. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:32:17 -04:00
Daniel Folkinshteyn
7f98aa7105 Some improvements to the commands.process function - better process naming and informational output. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:28:41 -04:00
Daniel Folkinshteyn
a2985c37d6 Create a commands.process function which runs a function inside a separate process. 
This is the only way to limit the execution time of a possibly long-running python statement.
Use this on String.re, due to the possibility of pathologically long re matching in python.
This allows us to remove the 'trusted-only' restriction on string.re.
In the future, this should probably be used in other places that take user-supplied regexps,
such as 'misc last --regexp', for example, as well as other potentially long-running tasks
that can block the bot.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 21:19:34 -04:00
Daniel Folkinshteyn
d691a91636 Topic: fix bug in invalid number error output. 
Previously, when giving an invalid positive number, error would reference number-1 as being invalid.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 20:52:27 -04:00
Daniel Folkinshteyn
84b878b10e Filter: catch invalid input for unbinary command. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 20:51:13 -04:00
Daniel Folkinshteyn
7feb50685a Filter: add unbinary command, as counterpart to binary command. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-15 20:47:30 -04:00
James McCoy
aa4071fa68 RSS: Remove local/feedparser and add it to install_requires 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-10-14 12:13:00 -04:00
Valentin Lorentz
4d1a7ea32a Display more explicit error if python-sqlite3 is not installed. 2012-10-13 08:54:33 +00:00
Valentin Lorentz
5ebbf2d516 Merge branch 'debian' into testing 
Conflicts:
	setup.py
 2012-10-12 19:56:43 +02:00
Valentin Lorentz
aff8cd30ad Merge pull request #419 from Mkaysi/automode-l10n-fi 
AutoMode: update l10n-fi.
 2012-10-07 09:00:06 -07:00
Mika Suomalainen
0098fa576e AutoMode: update l10n-fi. 2012-10-07 18:58:26 +03:00
Valentin Lorentz
b132e44418 Merge pull request #418 from Mkaysi/alias-l10n-fi 
Alias: update l10n-fi.
 2012-10-07 08:54:51 -07:00
Valentin Lorentz
514f26fc33 Merge pull request #417 from Mkaysi/google-l10n-fi 
Google: update l10n-fi.
 2012-10-07 08:54:38 -07:00
Valentin Lorentz
eca08f7ed0 Merge pull request #416 from Mkaysi/channellogger-l10n-fi 
ChannelLogger: update l10n-fi
 2012-10-07 08:54:25 -07:00
Mika Suomalainen
a80569c0ee AutoMode: update messages.pot 2012-10-07 18:54:21 +03:00
Mika Suomalainen
d8595bee85 Alias: update messages.pot 
I forgot to commit it again.
 2012-10-07 18:52:59 +03:00
Mika Suomalainen
9e2e6bf8f8 Alias: update l10n-fi. 2012-10-07 18:51:47 +03: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
Mika Suomalainen
e9923dbf38 ChannelLogger: update l10n-fi. 2012-10-07 18:39:45 +03:00
Mika Suomalainen
8e0100ac47 ChannelLogger: update messages.pot 2012-10-07 18:37:47 +03:00
Valentin Lorentz
707b2d77e6 Merge pull request #415 from Mkaysi/shrinkurl-l10n-fi 
ShrinkUrl: update l10n-fi.
 2012-10-07 08:37:42 -07:00
Mika Suomalainen
f584c10bc7 ShrinkUrl: commit updated messages.pot 2012-10-07 18:35:43 +03:00
Mika Suomalainen
1b85284100 ShrinkUrl: update l10n-fi. 2012-10-07 18:34:02 +03:00
Mika Suomalainen
38c512f3e1 Channel: update l10n-fi. 2012-10-07 18:12:56 +03:00
Mika Suomalainen
3fdbad99e2 Channel: update messages.pot 2012-10-07 18:04:47 +03:00
Valentin Lorentz
40801513ac Channel: Fix help for @iban. 2012-10-06 20:48:10 +00:00
Valentin Lorentz
c8dc3eac16 Channel: Use exact hostmask if provided. 2012-10-06 17:58:44 +00:00
Valentin Lorentz
fe9c28ffa8 Channel: Add command @iban. Closes GH-282. 2012-10-06 17:58:19 +00:00
Terje Hoås
cb623b2f4e Web: Fix fetch. Use getUrl instead of getUrlFd. 2012-10-02 18:19:53 +02:00
Valentin Lorentz
247ed460b0 Revert "Utilities: Add @concat command": already in Format. 
This reverts commit 75f9917f86.
 2012-09-30 11:35:35 +00:00
Valentin Lorentz
75f9917f86 Utilities: Add @concat command 2012-09-30 11:02:12 +00:00
Valentin Lorentz
45e6b7be7a Merge pull request #407 from resistivecorpse/testing 
adds an on off config option for logging of joins parts and quits in Cha...
 2012-09-26 10:53:09 -07:00
Mika Suomalainen
b7d762c041 Later: rename README.md -> README.txt 2012-09-26 19:29:18 +03:00
resistivecorpse
6d7b6a7d31 chaged msg.arg[0] to channel in if statements for joins and parts 2012-09-26 12:27:33 -04:00
Mika Suomalainen
405d68448a Later: write proper README. 
How can it be possible that there has been README file reading
"Insert a description of your plugin here, with any notes, etc. about using it" for eight years?
 2012-09-26 17:13:35 +03:00
resistivecorpse
82ed771b9e minor fixes to ChannelLogger 2012-09-25 01:11:09 -04:00
resistivecorpse
c154d2a51c Merge branch 'testing' of https://github.com/ProgVal/Limnoria into testing 2012-09-24 05:01:59 -04:00
Valentin Lorentz
d6da8a5a0d Unix: Prevent name conflict with _(). 2012-09-23 16:30:14 +00:00
resistivecorpse
54a6425e55 adds an on off config option for logging of joins parts and quits in ChannelLogger plugin 2012-09-22 16:01:29 -04:00
Valentin Lorentz
3a43229755 Merge branch 'py3k-backport' into testing 2012-09-22 17:44:10 +00:00
Valentin Lorentz
ad3bf1302f Web: Fix compatibility with Python <= 2.6. 2012-09-22 17:43:59 +00:00
Valentin Lorentz
5dbf4a58c7 Merge branch 'py3k-backport' into testing 2012-09-22 17:34:42 +00:00
Valentin Lorentz
a95546316f Web: Fix title snarfer with titles containing unicode characters. 2012-09-22 17:34:33 +00:00
Valentin Lorentz
dfbf74ba62 AutoMode: Prevent traceback if a unregistered user joins. 2012-09-22 17:22:35 +02:00
Valentin Lorentz
ae2f81356a Channel: Fix l10n-fr. 2012-09-20 20:05:40 +02:00
Valentin Lorentz
270e9b0806 Merge branch 'py3k-backport' into testing 
Conflicts:
	plugins/Web/plugin.py
 2012-09-19 15:09:47 +00:00
Valentin Lorentz
841dc719e1 Web: Fix page decoding. 2012-09-19 15:08:52 +00:00
Valentin Lorentz
b8b79d063d Admin: Change message 'It's banned me' into 'I am banned.'. Closes GH-329. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-17 22:22:34 -04:00
James McCoy
198688eab4 Import external dateutil module 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-17 22:15:52 -04:00
James McCoy
cef93a6cfd Use relative imports for all packages under the supybot namespace 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-17 22:12:11 -04:00
Valentin Lorentz
a8415c8d75 AutoMode: Fix commit 4eb674843e (extra modes). 2012-09-17 19:27:18 +02:00
Valentin Lorentz
0267f15a45 Owner: Reload module configuration in @reload. 2012-09-17 17:49:13 +02:00
Valentin Lorentz
4eb674843e AutoMode: Add support for extra modes (add supybot.plugins.AutoMode.extra). 2012-09-17 17:06:34 +02:00
Valentin Lorentz
74273b0d84 PluginDownloader: Recognize any file starting with 'README' in @info. 2012-09-16 13:01:16 +00:00
Valentin Lorentz
b5ff7d511c PluginDownloader: Recognize README.md in @info. 2012-09-16 12:53:34 +00:00
Valentin Lorentz
e43700d12d PluginDownloader: Add resistivecorpse's repository. 2012-09-16 12:40:01 +00:00
James McCoy
52e71edacc Time: Remove dateutil and add it to install_requires 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-10 22:28:34 -04: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
skizzhg
5ff40e3259 Herald & Protector & Todo: Fix l10n-it. 2012-09-10 18:10:20 +02:00
Valentin Lorentz
97a977a1eb Merge branch 'py3k-backport' into testing 2012-09-07 17:20:16 +00:00
Valentin Lorentz
f747c5a7d4 Config: Fix @reload. 2012-09-07 17:20:09 +00: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
b7efbf409c Plugin: Fix failures in testPlugin 
The tests were running into the ambiguity between nested commands and commands
with the same name as their plugin, so "plugin plugin" is treated as
specifying the plugin command from the plugin plugin.  This leads to it
displaying the help, since an argument is expected.

Since the Utilities plugin is already loaded by the test suite, use a command
from it as the argument to the plugin command.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-05 21:50:42 -04:00
James McCoy
d73a801d8f Web: Remove/update non-functional tests 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-05 21:35:56 -04:00
Mika Suomalainen
bcfdcf09cf MoobotFactoids: fixed mistakes and added ACTION to README. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
d38cc2daab MoobotFactoids: improved readme file from default. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
5166d840aa Internet: improved README. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
49288d2a27 Herald: improved README. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
8c1c34c723 Games: improved README. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
ee340fa42c Format: improved README 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
0207b43076 Filter: created readme from plugin help. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
bc9450eead Factoids: improved README 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
dc416ecf20 Dunno: improved README 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
Mika Suomalainen
11ef44c060 Ctcp: improved README 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:50:44 -04:00
James McCoy
b41affa8b6 fixup 9f0c308f 2012-09-04 22:50:44 -04:00
Mika Suomalainen
9f0c308f19 ChannelStats: improved README 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:40:03 -04:00
Mika Suomalainen
55dd7810d2 ChannelLogger: improved readme 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:38:18 -04:00
Mika Suomalainen
f96fcaf000 AutoMode: improved readme 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:37:00 -04:00
Mika Suomalainen
c609f88779 Anonymous: added readme 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-09-04 22:36:20 -04:00
Valentin Lorentz
f912de74f6 Admin: Change message 'It's banned me' into 'I am banned.'. Closes GH-329. 2012-09-03 14:07:23 +02:00
Valentin Lorentz
e5e2db15b2 ShrinkUrl: Implement @expand. Closes GH-392. 2012-09-02 10:06:33 +02: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
James McCoy
232aa86a1e Merge branch 'maint/0.83.4' 2012-09-01 09:13:52 -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
Daniel Folkinshteyn
c7ed79571a Seen: check to see if the bot is in target channel before doing anything. 
Otherwise the check to see if user is in channel generated an error.
 2012-08-30 15:34:28 -04:00
Valentin Lorentz
619dd2ce82 Merge branch 'merge-gribble' into testing 2012-08-30 11:38:56 +02:00
Daniel Folkinshteyn
38ff1a1137 Seen: require caller to be in target channel when using commands in this plugin. 
This fixes information leakage from private channels.

Conflicts:
	plugins/Seen/plugin.py
 2012-08-30 11:33:55 +02:00
Daniel Folkinshteyn
e557541de1 Channelstats: require caller to be in target channel when using commands in this plugin. 
This fixes information leakage from private channels.
 2012-08-30 11:33:01 +02:00
Daniel Folkinshteyn
643788b478 Math: default %f formatting rounds to 6 decimal places. increase that to 16. 2012-08-30 11:32:43 +02:00
Valentin Lorentz
ba876d7ddf Fix commit 17227a6829. 2012-08-28 20:27:22 +00:00
Valentin Lorentz
17227a6829 AutoMode: Dismiss auto-op/halfop/voice if the user already has it. 2012-08-27 15:42:08 +02:00
Valentin Lorentz
0c6320e9c1 RSS: Display error instead of traceback if fetching a feed failed. 2012-08-26 07:38:40 +00: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
b5e965c48a Web: Decode _after_ reading the page in @fetch. 2012-08-14 21:08:54 +00:00
Joe Julian
653e4dec1b urlquoting the url leads to short urls that prepend "http://" to the url 2012-08-14 18:56:44 +02:00
Valentin Lorentz
24d73eb1f8 ShrinkUrl: Add ur1.ca support. 2012-08-11 11:07:40 +02:00
Valentin Lorentz
12b8e44dc7 AutoMode: Fix traceback since b5c99b1c. 2012-08-10 13:04:25 +00: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
62d56dee18 Alias: Allow pipes in name. 2012-08-08 21:44:10 +02:00
Valentin Lorentz
1e794d88d7 ChannelLogger: Use open() instead of file(). 2012-08-07 20:53:06 +00:00
Valentin Lorentz
94d09da44a Alias: Save and restore aliases with dots in them. 2012-08-06 20:36:10 +02:00
Valentin Lorentz
22befe3d61 Owner: Prevent use of uninitialized variable. 2012-08-05 18:28:17 +02:00
Valentin Lorentz
ea17fe5c57 Unix: Decode stream for the command line in sysuname. 2012-08-05 18:26:39 +02:00
Valentin Lorentz
4fc1e934c7 PluginDownloader: Open target files in binary mode. 2012-08-05 18:02:54 +02:00
Valentin Lorentz
a40ebae4da String: Apply/unapply base64 encoding when dealing with a binary encoding. 2012-08-05 17:55:29 +02:00
Valentin Lorentz
5ae3e3fdcf ShrinkUrl: Decode data from web services. 2012-08-05 16:58:09 +02:00
Valentin Lorentz
709c3390ef Internet: Remove debug print. 2012-08-05 15:20:35 +02:00
Valentin Lorentz
124e292f1f Catch sort errors in ChannelUserDB. 
In case the dictionnary has both integers and strings as keys, items.sort() raises a TypeError.
 2012-08-05 15:19:20 +02:00
Valentin Lorentz
a731841af8 Dict: Decode network stream as unicode. 2012-08-05 14:38:11 +02:00
Valentin Lorentz
34bb33b65f Alias & MoobotFactoids: Fix import error in test.py. 2012-08-05 14:14:55 +02:00
Valentin Lorentz
242a54fbf2 Alias & RSS: remove third argument to types.MethodType. 
It is useless in the case in point, and is not compatible with Python 3.
 2012-08-05 14:08:04 +02:00
Valentin Lorentz
8507498be4 Web: make plugin py3k-friendly. 2012-08-04 22:23:40 +02:00
Valentin Lorentz
6537137b3f Unix: make plugin py3k-friendly. 2012-08-04 22:20:20 +02:00
Valentin Lorentz
65eb79b8f2 String: Use the 'codecs' module and make it py3k-friendly. 2012-08-04 22:04:13 +02:00
Valentin Lorentz
de5747aecb ShrinkUrl: Use utils.web.getUrl instead of httplib2. 2012-08-04 21:33:58 +02:00
Valentin Lorentz
36812798fb Make ChannelUserDictionary subclass collections.MutableMapping instead of deprecated UserDict.DictMixin. 2012-08-04 21:16:00 +02:00
Valentin Lorentz
11df697b96 RSS: Be compatible with new versions of feedparser. 2012-08-04 20:43:11 +02:00
Valentin Lorentz
c99fe9519e PluginDownloader: Make plugin py3k-friendly. 2012-08-04 20:39:30 +02:00
Valentin Lorentz
0134696b8b Misc: make plugin py3k-friendly. 2012-08-04 20:25:36 +02:00
Valentin Lorentz
987aaa6c37 Math: use string.ascii_uppercase instead of string.uppercase. 2012-08-04 20:23:30 +02:00
Valentin Lorentz
224bdf89e7 Math: implement __lt__ and __eq__ in converter.Unit. 2012-08-04 20:22:11 +02:00
Valentin Lorentz
1be1ddb386 Later: Use open() instead of file(). 2012-08-04 20:20:14 +02:00
Valentin Lorentz
0b49c7312f Internet: use binary I/O. 2012-08-04 20:07:24 +02:00
Valentin Lorentz
978a702346 Google: Use 'json' module and apply .decode() on data. 2012-08-04 19:50:30 +02:00
Valentin Lorentz
a89ff32297 Filter: Use the 'codecs' module instead of .encode and .decode. 2012-08-04 19:43:11 +02:00
Valentin Lorentz
9dcfce01c7 Dict: Open connection in binary mode. 2012-08-04 19:22:31 +02:00
Valentin Lorentz
dcd07a2ec4 ChannelStats & Filter & Math & Unit: use utils instead of str.translate. 2012-08-04 19:13:35 +02:00
Valentin Lorentz
88c2c130ca BadWords & Nickometer: Use 'future' divisions. 2012-08-04 18:54:14 +02:00
Valentin Lorentz
8b7d16c850 Alias & RSS: Use types.MethodType instead of new.instancemethod. 2012-08-04 18:46:16 +02:00
Valentin Lorentz
458508a287 Merge pull request #381 from Mkaysi/plugindownloader-l10n-fi 
PluginDownloader: update l10n-fi.
 2012-08-04 05:57:51 -07:00
Valentin Lorentz
a27acdaecd Merge pull request #383 from Mkaysi/network-l10n-fi 
Network: update l10n-fi.
 2012-08-04 05:57:42 -07:00
Valentin Lorentz
165f4ca38c Merge pull request #382 from Mkaysi/misc-l10n-fi 
Misc: update l10n-fi.
 2012-08-04 05:57:26 -07:00
Valentin Lorentz
45120dda07 Merge pull request #385 from Mkaysi/google-l10n-fi 
Google: update l10n-fi.
 2012-08-04 05:57:17 -07:00
Valentin Lorentz
3989814030 Merge pull request #384 from Mkaysi/topic-l10n-fi 
Topic: update l10n-fi.
 2012-08-04 05:56:51 -07:00
Valentin Lorentz
de28a95e9f Merge pull request #380 from Mkaysi/shrinkurl-l10n-fi 
ShrinkUrl: update l10n-fi.
 2012-08-04 05:56:09 -07:00
Mika Suomalainen
8b89014d10 Google: update l10n-fi. 2012-08-04 15:48:12 +03:00
Mika Suomalainen
6e7eb6e509 Topic: update l10n-fi. 2012-08-04 15:44:08 +03:00
Mika Suomalainen
5cb4fbcc50 Network: update l10n-fi. 2012-08-04 15:36:53 +03:00
Mika Suomalainen
89a2ed7313 Misc: update l10n-fi. 2012-08-04 15:30:53 +03:00
Mika Suomalainen
99991b43a5 PluginDownloader: update l10n-fi. 2012-08-04 15:22:11 +03:00
Mika Suomalainen
4656fd5805 ShrinkUrl: update l10n-fi. 2012-08-04 15:15:42 +03:00
Mika Suomalainen
3c3e615199 plugins/RSS/locale/fi.po: update headers. 2012-08-04 15:09:45 +03:00
Valentin Lorentz
df2d976818 Use utils.str.MultipleReplacer instead of str.maketrans. 2012-08-04 14:04:15 +02:00
Mika Suomalainen
9760a44137 RSS: update l10n-fi 2012-08-04 15:02:17 +03:00
Valentin Lorentz
b17228d683 MoobotFactoids: Use Supybot's shlex instead of the standard library's. 
Supybot's uses a separator whitelist instead of a 'valid chars' blacklist,
which is better when handling non-ascii charsets.
 2012-08-04 14:00:23 +02:00
Valentin Lorentz
1cb657ddb2 Import imap directly from itertools instead of utils.iter. 2012-08-04 13:21:37 +02:00
Valentin Lorentz
d52e501ae8 Use open() instead of file(). 2012-08-04 13:13:16 +02:00
Valentin Lorentz
cd0bfe411a Make gpg key adding/removal work. 2012-08-03 23:22:53 +02:00
Valentin Lorentz
fa67967b09 And commands to add/remove GPG keys. 2012-08-02 09:21:58 +02:00
Valentin Lorentz
59b9ba2cf8 RSS: Update l10n-fr. 2012-07-31 21:12:37 +02:00
Valentin Lorentz
4bc5ed4f2d RSS: Internationalize three strings. 2012-07-31 19:09:18 +00: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
5033893e9c Merge branch 'testing' of github.com:ProgVal/Limnoria into testing 2012-07-30 11:36:39 +02:00
Valentin Lorentz
e8fd44570a Misc: Internationalize a string & update l10n-fr. 2012-07-30 11:31:17 +02:00
Valentin Lorentz
bdbb618ac8 Anonymous: Fix l10n-fr. 2012-07-29 18:06:56 +00:00
Valentin Lorentz
ea21c7aff5 Google: Fix l10n-fr 2012-07-29 13:40:03 +00:00
Valentin Lorentz
afbdcf89f5 Misc: Fix l10n-fr. 2012-07-29 12:35:51 +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
Valentin Lorentz
031b09307e Math: Allow 'factorial()' in icalc. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-07-13 14:14:24 -04:00
Valentin Lorentz
27857ff6f8 Math: Block factorial() in calc functions. 
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-07-13 14:14:10 -04:00
Terje Hoås
e19ff328b6 Google: Fix currency conversions. 2012-07-13 19:05:21 +02:00
Valentin Lorentz
ac3724d326 Games: Add halfop support in @roulette. 2012-07-13 14:08:55 +00:00
Valentin Lorentz
c37d8c9310 PluginDownloader: Fix issue with repositories that use a subfolder. (fix commit 0a442dfd15) 2012-07-10 08:44:33 +00:00
Valentin Lorentz
95c55c8d0f PluginDownloader: Add nyuszika7h's repository. 2012-07-09 11:08:51 +00:00
Valentin Lorentz
18dd017e99 Merge remote-tracking branch 'supybot/maint/0.83.4' into testing 
Conflicts:
	sandbox/release.py
 2012-07-06 11:09:34 +02:00
Valentin Lorentz
c31b6ed5c6 Merge pull request #376 from Digital-Lemon/testing 
Network: Added @uptime && Irc.startedAt attribute
 2012-07-05 02:34:26 -07:00
skizzhg
38dcffd466 Network: update l10n-it. 2012-07-04 22:48:49 +02:00
James McCoy
a42ab2e2d4 ircutils.FormatParser: Make getInt only get integers that are valid colors 
If a colored message were wrapped just right (e.g., a colored number ending
the chunk), FormatParser would gobble up the color format code and the number
in the message, causing a KeyError when trying to look up the color in
mircColors.

Signed-off-by: James McCoy <jamessan@users.sourceforge.net>
 2012-07-02 21:11:50 -04:00
Digital-Lemon
de89a9bf90 Added @network uptime 2012-06-30 02:35:40 +02:00
Valentin Lorentz
4a6d7fdb8e PluginDownloader: Add Hoaas repo. 2012-06-29 15:04:37 +00:00
Valentin Lorentz
3ae2ce9483 Merge branch 'master' into debian 
Conflicts:
	.gitignore
	src/version.py
 2012-06-23 17:44:06 +02:00
Valentin Lorentz
ceee427e1f PluginDownloader: Remove debug output. 2012-06-13 18:29:25 +02:00
Valentin Lorentz
0a442dfd15 PluginDownloader: Use GitHub's APIv3. 2012-06-13 18:07:23 +02:00
Daniel Folkinshteyn
c991175425 Math: default %f formatting rounds to 6 decimal places. increase that to 16. 2012-06-12 12:28:26 -04:00
Valentin Lorentz
01c0ca63e5 Merge pull request #370 from nyuszika7h/topic_save 
Topic: Reply success when saving topic if there was no error
 2012-06-10 04:26:12 -07:00
nyuszika7h
d827dfa580 Topic: Reply success when saving topic if there was no error 2012-06-09 20:30:14 +02:00
skizzhg
228e958362 ShrinkUrl: Update l10n-it. 2012-06-09 19:22:27 +02:00
skizzhg
f78f0322d1 ShrinkUrl: Fix help (add 'goo'). 2012-06-09 19:22:10 +02:00
skizzhg
ce59101f84 Channel: Update l10n-it 2012-06-09 19:21:03 +02:00
skizzhg
32eef54a65 RSS: Update l10n-it. 2012-06-06 13:39:54 +02:00
Joe Julian
7cc8feaf32 ShrinkUrl: Support for goo.gl url shortener. 2012-05-28 19:58:15 +02:00
Sebastian Kayser
2486be4464 RSS: sort and display feed items by date 2012-05-28 19:32:24 +02:00
Valentin Lorentz
d41d684ce1 Merge branch 'testing' of github.com:ProgVal/Limnoria into testing 2012-05-25 18:26:33 +02:00
James McCoy
198e525606 Success: Allow the plugin to be loaded from a query 
Closes: Sf#3513915
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Success/plugin.py
 2012-05-25 18:17:09 +02:00
James McCoy
7d99c28cf6 Channel: Perform proper capability checks in devoice. 
Closes: Sf#3524393
Signed-off-by: James McCoy <jamessan@users.sourceforge.net>

Conflicts:

	plugins/Channel/plugin.py
 2012-05-25 18:13:14 +02:00