1701 commits

Author	SHA1	Message	Date
j	fba6281b3f	sort by part should be same as stream sort	2013-02-08 12:26:56 +00:00
j	d1b210d06a	better item detection of existing items, sort steams by part and fallback to path	2013-02-08 11:05:35 +00:00
j	ca5bf80763	fix notranslate	2013-02-05 12:14:28 +05:30
j	98adab1259	make folderdepth part of config	2013-02-04 18:37:26 +05:30
j	cd43bc2135	fix	2013-02-03 14:22:20 +05:30
j	87bf09fad2	use integer sort string for archives not using imdb ids	2013-02-03 14:21:15 +05:30
j	2eafb9b3f8	fix index creation	2013-01-31 20:41:46 +00:00
j	e6aaf0aa6b	fix partial findvalue commit	2013-01-31 11:19:21 +00:00
j	d63e5cba32	use duration of files while we dont have streams, fixes #1208	2013-01-31 08:52:37 +00:00
j	c576e347a8	use pyinotify to watch for config changes if installed	2013-01-31 08:44:30 +00:00
j	31652fe3d8	update json cache too	2013-01-31 08:16:04 +00:00
j	c748527921	create and update GNI indexes	2013-01-31 07:54:39 +00:00
j	b43a6cf647	double check if poster does not exist if it was created async	2013-01-29 07:19:57 +05:30
j	039f8c9335	remove error log entries after 30 days	2013-01-12 08:20:22 +00:00
j	3f2ba727bd	dont fail if findvalue is not set	2013-01-12 08:12:11 +00:00
j	ffd256ca93	use display_aspect_ratio of stream if set	2013-01-11 12:48:40 +05:30
rolux	f330a6becb	typo	2012-12-27 15:05:46 +01:00
rolux	2cad149414	clean up get_hash method	2012-12-27 14:44:28 +01:00
j	6cfaa54f97	use aac encoder(libvo_aacenc) available in ubuntu 12.04 universe (libavcodec-extra-53)	2012-12-16 19:56:54 +01:00
j	e1dbb7089f	fix default itemKey data	2012-12-16 16:21:05 +00:00
j	28aadd6a43	make sure derivative name is set before encoding	2012-12-14 15:05:37 +01:00
j	18d9c93fff	add default itemKey value support, add license as default value to pad.ma. fixes #1180	2012-12-14 15:03:15 +01:00
j	5392750348	fix inital database creation	2012-11-27 16:10:17 +01:00
j	1f18bcbb15	fix extract_derivatives command	2012-11-20 17:39:44 +01:00
j	066d7c8588	find clip queries too	2012-11-18 20:41:18 +01:00
j	73cbde63cf	clips too	2012-11-18 20:34:43 +01:00
j	ec5158c03a	normalize find values and make lower case, also normalize and lowercase quieries	2012-11-18 20:26:13 +01:00
j	1bc21588a6	fix type of direct uploads	2012-11-16 02:50:10 +01:00
j	ead22ed222	fix sort check	2012-11-16 02:27:09 +01:00
j	11ad4f9e2c	dont fail if sort is missing	2012-11-16 02:03:39 +01:00
j	d4af01a905	add up volume for multi part files	2012-11-10 00:28:34 +01:00
j	db9e943b28	parse info after updating	2012-11-09 12:11:56 +01:00
j	bb7d43e29f	typo	2012-11-09 12:10:25 +01:00
j	597fe9d6c6	always request info for all files that need it	2012-11-09 12:07:38 +01:00
j	b8a5ba568d	ass seriesYear, episodeDirector to hardcoded fields, fixes #971	2012-11-07 00:47:18 +01:00
j	cddb6f6560	hardcode 'episodeTitle', 'seriesTitle' as allowed edit keys, fixes 1121	2012-11-07 00:41:22 +01:00
j	caaff10884	check lower case extension	2012-11-04 17:47:25 +01:00
j	3b866d1d1b	silence reload failures	2012-11-02 13:47:37 +01:00
j	2c07dedac0	add south migrations, convert update to python	2012-11-02 13:41:41 +01:00
rolux	5d38d352d2	Pad.ma: Don't format 'Times Accessed' as date, fixes #1108	2012-10-28 12:54:13 +01:00
j	1872621d8c	add manage.py command to recheck useragents	2012-10-27 17:25:32 +02:00
j	ad90b43b4b	better unicode support for download names	2012-10-24 17:18:55 +02:00
j	f1a71f23cf	fix imports	2012-10-15 16:02:59 +02:00
j	520650d53b	add sortName api	2012-10-15 15:56:08 +02:00
j	451577a3f9	only update ids if needed	2012-10-10 13:36:01 +02:00
j	22e7dc7421	dont fail for clips < 0	2012-10-09 19:22:16 +02:00
j	6fd5adbb1d	dont fail for clips < 1 frame	2012-10-09 19:10:46 +02:00
j	7f08cc4bf3	use title/originalTitle not title/internationalTitle	2012-10-09 14:57:21 +02:00
j	4bbc6a6310	no default director, fixes #1080	2012-10-09 12:46:51 +02:00
j	d340e753e5	dont normalize path for pad.ma like systems for now	2012-10-06 16:37:13 +02:00
j	5bd36539f0	dont fail if sort is not set	2012-10-06 13:59:33 +02:00
rolux	af9a038c19	use Ox.formatColorPercent	2012-10-05 14:15:27 +02:00
rolux	2e628bb1b6	remove 'rating' column	2012-10-05 10:14:16 +02:00
rolux	3e047e44b3	update display strings change formatting of votes and likes, as per ticket 1061	2012-10-04 11:42:33 +02:00
j	8becaf2bb8	also serve torrent at id/torrent not only id/torrent/	2012-10-04 10:44:09 +02:00
j	5daba46fb4	set default session age to 2 month, change session in init so it expires 2 months after the last init call. fixes #1056	2012-10-02 10:36:43 +02:00
j	0fe1786ec0	update paths after changing name, fixes #1013	2012-09-30 18:27:01 +02:00
j	3c77916231	support lists..sort as key, fixes #1046	2012-09-29 19:00:54 +02:00
rolux	7d44b328e1	fix #1031 (only one decimal digit for 'likes')	2012-09-28 13:35:44 +02:00
j	e7eae1c9c3	likes as %	2012-09-27 15:11:22 +02:00
j	b097dc2862	manualy set json/modified, gets out of sync otherwise	2012-09-27 06:32:35 +02:00
j	a0e14d299b	update sort/find/facets after saving	2012-09-27 06:28:34 +02:00
j	f31a2dfc2b	add likes, fixes #1021	2012-09-27 01:08:39 +02:00
j	c413d3526b	cleanup poster update	2012-09-25 19:00:10 +02:00
j	547601d7a3	get modified from sort table, fixes #1018	2012-09-25 12:49:54 +02:00
j	80a242ee49	only update annotations if public_id really changed	2012-09-25 12:24:01 +02:00
j	f39b2ddf3f	allow formated time for clip extraction too	2012-09-23 10:32:35 +02:00
j	20d1119b75	use internationalTitle and new alternative title format: fixes #947 and #963	2012-09-22 22:00:32 +02:00
j	bc2c3b65ad	match alternativeNames too, <br>\n shouldbe one space fixes 992	2012-09-18 16:09:56 +02:00
j	9ee71ce6dd	split program update and current json	2012-09-18 12:20:18 +02:00
j	103f3396d6	only play items with duration	2012-09-18 11:35:16 +02:00
j	6d6555e3bb	dont special case id, fixes #602	2012-09-17 13:25:30 +02:00
j	148912ab37	save_url	2012-09-15 14:04:38 +02:00
j	64376795ff	fix offset option in srt	2012-09-15 12:23:17 +02:00
j	7b22bba4e7	use path to populate unknown sort names, #958	2012-09-14 11:50:08 +02:00
j	fdb358ea89	part might be int	2012-09-14 11:03:30 +02:00
j	7248616937	fix part sort	2012-09-14 11:02:08 +02:00
j	1b27def499	no default width/height	2012-09-14 10:54:09 +02:00
j	45d7bb3ea3	only videos have resolution	2012-09-14 00:15:08 +02:00
j	1bbfa6e0c8	no more auto, seriesYear	2012-09-12 18:16:54 +02:00
j	a1a8c0b428	typo	2012-09-12 11:50:50 +02:00
j	38af33bb2f	format_path return value changed	2012-09-12 11:48:52 +02:00
j	69af82bd9f	store full path info	2012-09-12 11:44:22 +02:00
j	f3605569fa	cleanup getPath response	2012-09-11 15:39:49 +02:00
j	d87a7ce181	parse_path expects top level	2012-09-11 15:32:17 +02:00
j	3de99bb4b6	update paths on item edit, enable editable fields in editFile, part is a string now	2012-09-11 15:17:35 +02:00
j	6916792f95	new file/path logic	2012-09-11 14:42:33 +02:00
j	ccf4889c7e	fix import	2012-09-11 14:38:10 +02:00
j	e2c61e4a78	dont fail if item has not steams	2012-09-11 14:36:25 +02:00
j	92940398a6	update channels daily	2012-09-11 14:35:58 +02:00
j	8ac1db8442	update item info on addAnnotation too	2012-09-10 10:23:09 +02:00
j	e5107d8610	- fix upload for non admin users ... - fix https test - give permission denied warning if upload is not working	2012-09-08 17:03:59 +02:00
j	084fde7b67	save again	2012-09-08 14:56:40 +02:00
j	e3d0893a00	reorder code so that item status does not get overwritten	2012-09-08 14:41:19 +02:00
j	e0172a38f4	File.duration	2012-09-08 13:41:11 +02:00
j	90a7488797	if info has duration of 0 or less use duratino from extracted streams (work around issues in upload process)	2012-09-08 13:37:52 +02:00
j	0151b282a2	fix torrent download	2012-09-08 13:14:28 +02:00
j	d4caad4871	normalizedPath	2012-09-08 00:30:56 +02:00
j	9c754252a0	self	2012-09-08 00:25:26 +02:00
j	da9dd942b2	index all instance paths too, add getPath	2012-08-22 00:18:00 +02:00
j	faf9865f87	new ox.torrent api	2012-08-21 10:49:20 +02:00
j	189d0ac249	new python-ox api	2012-08-15 17:15:06 +02:00
j	6895a13833	use volume to sort by volume, fixes #825	2012-07-02 17:07:39 +02:00
rolux	70c0db1cf4	fix #899 (formatting of aspect ratio)	2012-07-02 16:11:58 +02:00
j	78bb1cc0ed	keep session data and ui state on signup. fixes #898	2012-07-01 21:03:47 +02:00
j	f5003f9613	redirect to files view	2012-06-28 15:55:38 +02:00
rolux	ad01da8f36	update version text in software panel of site dialog, add a capability	2012-07-01 12:24:57 +00:00
j	c531fb68c4	update poster aspect on poster update	2012-07-01 12:17:04 +00:00
j	a1163b5f2e	unset page if its signout on signout	2012-07-01 10:27:06 +00:00
j	9ceeb34171	dont add empty set for users with only ignored files	2012-06-28 14:59:08 +02:00
j	8b082023e9	add some more docs for findClips	2012-06-26 13:59:27 +02:00
j	3fca65e86b	dont save oxdbid if not using imdb, 2 items might have the same id	2012-06-26 10:48:43 +02:00
j	5d87258eb8	remove redirect	2012-06-26 10:40:31 +02:00
j	523176ee51	set pandora.site.site.version and show on /software, fixes #866	2012-06-22 11:38:36 +02:00
rolux	285b4faef0	update titles of timeline modes	2012-06-20 18:57:55 +02:00
j	aaa6981a54	ignore empty annotations in find	2012-06-18 18:36:40 +02:00
j	81cef44d19	dont save clip/sequence ids in db	2012-06-18 16:36:04 +02:00
j	907f115b36	fix config.pandora.jsonc	2012-06-18 12:01:05 +02:00
j	aed67b9e42	only commit if we have data	2012-06-17 16:32:28 +02:00
j	9f4cdb1f63	load sequences with raw sql	2012-06-17 16:23:54 +02:00
j	7f567d78a0	round srt timestamps to 3 digits	2012-06-17 01:10:34 +02:00
j	c405d007eb	sequence duration	2012-06-16 23:44:05 +02:00
j	72be96fe56	position = start	2012-06-16 23:41:55 +02:00
j	80ed3b19d0	order query	2012-06-16 23:29:06 +02:00
rolux	2d074ec295	update config (layer item singular)	2012-06-16 16:44:29 +00:00
j	7476db5b47	pandora demo: use small video by default, space before summary	2012-06-16 13:24:45 +02:00
j	480d6c8cf2	use 0 padded 3 digit floats in qids for clips	2012-06-16 11:26:37 +02:00
j	e9d26d4c3d	typo	2012-06-16 11:01:01 +02:00
j	a66ee51280	round position to three digits before saving in database	2012-06-16 11:00:45 +02:00
j	be6abcc4b7	enabled sequence extraction by default	2012-06-16 00:08:52 +02:00
j	1e88e6697f	check if its first position	2012-06-15 23:57:03 +02:00
j	cde92a1624	extract sequences from all parts	2012-06-15 23:53:40 +02:00
j	e21484af1c	make sequence ids same as clip ids	2012-06-15 22:32:15 +02:00
j	ca93e35c00	module issues in join timelines	2012-06-15 16:44:32 +02:00
j	b9ce9d487c	more demo config cleanup	2012-06-13 18:01:32 +02:00
j	70892dd463	better demo config and info view ... always pass oxdbId to poster script use 0xdb like poster script for demo	2012-06-13 17:59:10 +02:00
j	e72a9675c7	make copy and pase of oshash from filesystem easier	2012-06-13 09:45:39 +02:00
j	d1562237de	actually use name sort	2012-06-12 11:23:25 +02:00
j	c7ad68cab9	/ID/frameposterX.jpg should be /ID/posterframeX.jpg, fixes #663	2012-06-11 10:30:29 +02:00
rolux	aff1252f3b	update format for volume (like lightness)	2012-06-10 20:12:14 +00:00
j	e63c698b5d	and and	2012-06-10 12:22:45 +02:00
j	71fdb6f8aa	trigger done with better info if upload fails, dont fail if screen/window are not defined in init	2012-06-10 11:05:48 +02:00
j	c753688f41	fix queue for cronjob	2012-06-07 10:59:13 +02:00
j	9b93c8ec2a	add sequence backend	2012-06-06 21:49:32 +02:00
rolux	630dd61adb	add user.ui.sequenceMode and sequenceSort	2012-06-06 17:34:34 +02:00
j	d543e35f3f	rebuild timelines in encoding pipe	2012-06-06 16:38:18 +02:00
j	8cfbef2505	descriptions need to be escaped in header	2012-06-04 22:27:50 +02:00
j	6e7b029f1c	fix iframe width/height	2012-06-04 22:14:48 +02:00
j	9173ce454b	simplyfy icon header, IE does not support png anyway	2012-06-04 22:11:25 +02:00
j	a0d337e6d8	city values are unicode in django 1.4	2012-06-04 21:22:44 +02:00
rolux	1d19c5d9a2	omit 0 for number of decimals when calling formatUnit (0 is the default)	2012-06-04 12:41:11 +02:00
rolux	4c96a9843c	update format for 'bitrate' property	2012-06-04 12:33:58 +02:00
j	c2ad332bbe	typo	2012-06-03 01:40:19 +02:00
j	495a22dd97	dont fail if part has no timeline, look for timeline fallback from top	2012-06-03 00:39:36 +02:00
j	eee7d1baef	fix event update	2012-05-31 22:11:35 +02:00
j	7936a2180e	avoid division by zero	2012-05-30 17:52:50 +02:00
j	04a5628268	delete annotation that is not on a clip layer	2012-05-30 17:29:09 +02:00
j	24caf0e0c5	use new timeline names for poster/icon	2012-05-30 14:48:08 +02:00
j	66280a44c1	sync django is_superuser status with level	2012-05-30 11:07:59 +02:00
j	4ece83f4c8	dont crate private items by default	2012-05-30 10:10:35 +00:00
j	8bb3652f5a	typo	2012-05-30 00:26:31 +02:00
j	76aa590bbb	add manage.py command to extract derivatives, fixes #783	2012-05-29 17:02:59 +02:00
j	55992dd834	use Ox.SyntaxHighlighter on /api/	2012-05-29 14:22:39 +02:00
j	488e982483	allow rendered find queries, fixes #804	2012-05-29 11:26:18 +02:00
j	25b87a10b0	load Ox.js only once	2012-05-28 13:36:10 +02:00
j	19a56af125	only cleanup clips related to item, gets to slow with many annotations	2012-05-27 15:16:07 +00:00
j	12226662f8	smarter places/events update	2012-05-27 14:21:08 +00:00
j	59f575d489	disable place/event rebuild tasks, those should not be needed anymore	2012-05-27 12:05:07 +00:00
j	69b1e6c7b2	cleanup use of python-ox api	2012-05-27 13:52:12 +02:00
j	99aee48d98	django 1.4 only creates session if needed	2012-05-24 14:39:41 +00:00
j	fd5f0c3c4c	upgrade to django 1.4	2012-05-23 13:54:36 +00:00
j	0719735feb	compute proper facet sort value	2012-05-22 10:12:41 +02:00
j	8d5dfd7413	dont use mutables as default values	2012-05-21 14:46:48 +02:00
j	a711d2d2ce	fix comment	2012-05-19 14:56:29 +02:00
j	bc494f6c18	remove ipv6 prefix from ipv4 addresses	2012-05-19 13:46:06 +02:00
j	45ff05ca49	remove debug	2012-05-17 11:40:44 +02:00
j	96ec35e51a	use oxtimelines	2012-05-17 11:38:59 +02:00
j	f09e4205cf	sort_string, sorted_strings moved to ox	2012-05-16 12:31:44 +02:00
j	e4f635066e	restricted videos can not be downloaded on pad.ma	2012-05-04 13:32:22 +02:00
j	1c80fb1f08	layer facets too	2012-04-24 19:13:44 +02:00
j	079b0051c0	facets need to be decoded too	2012-04-24 19:09:10 +02:00
j	fa70e88edd	add empty canPlay options to all config files	2012-04-22 21:53:50 +02:00
rolux	4841e2c0a8	implement 'cantPlay' config options	2012-04-22 09:57:49 +00:00
j	e5da40a104	first round of makeing png/js/script/config overwrite more consistent	2012-04-20 12:22:32 +02:00
j	14fa74bf44	add resolutions to firefogg upload	2012-04-19 18:14:43 +02:00
j	1cad133fc3	add more video modes	2012-04-19 18:06:38 +02:00
rolux	ab46a85a89	hide times accessed and last accessed from regular users (fixes #741)	2012-04-19 09:29:37 +00:00
j	bb2504a0b2	0xdb does not privide download, fixes #750	2012-04-18 12:51:48 +02:00
j	7f96b34e54	fix torrent path, set rendered to false if uploading again	2012-04-18 11:11:12 +02:00
rolux	60f78463e3	change order of list and item views	2012-04-18 08:32:58 +00:00
rolux	88e65748e1	add 'followPlayer' UI preference	2012-04-17 12:02:32 +00:00
rolux	707fdd95ed	add timeline item view	2012-04-17 10:03:11 +02:00
rolux	f5f6ff468f	rename item views ('video' -> 'player', 'timeline' -> 'editor')	2012-04-17 09:06:19 +02:00
j	c651f70bbc	add date format to padma.jsonc fixes #733	2012-04-03 09:12:23 +02:00
j	00c8f47541	inbetween queries	2012-04-02 17:33:23 +02:00
j	9da8c75f70	dont fail if clipLayers is missing	2012-04-02 17:33:09 +02:00
j	513e79b431	add distinct again	2012-04-02 12:56:39 +02:00
j	b55d368920	faster item query, drop distinct	2012-04-02 12:52:53 +02:00
j	0042546d6c	print local name and ip in vm terminal, document trigram index	2012-03-30 16:57:07 +02:00
j	82d939e6e3	return robots count	2012-03-30 16:34:33 +02:00
j	494f5cfa0b	empty years	2012-03-27 19:42:49 +02:00
rolux	b515feb456	remove mail->country check, too esoteric	2012-03-27 16:17:50 +00:00
rolux	879d114995	fix sort key titles in padma.jsonc	2012-03-27 14:59:20 +00:00
j	577afd682e	only add index flag if DB_GIN_TRGM is set	2012-03-27 13:26:51 +02:00
rolux	0e31c7cb97	handle webkit and robots	2012-03-27 10:24:16 +00:00
rolux	8a1fd4afda	move fallback location test (email TLD) into the backend	2012-03-27 07:29:01 +00:00
rolux	9098e22b68	better theming of statistics; use capabilities in menu, not 'isAdmin'	2012-03-27 07:14:59 +00:00
j	a562ec428a	support robots in findUsers api	2012-03-26 13:58:33 +02:00
j	a4ac2e03d4	load subtitles async	2012-03-23 17:37:32 +01:00
j	8fac4c558d	only limit grup if needed, do not overwrite clips sort	2012-03-23 16:52:20 +01:00
j	950b6533b0	tweak clip table	2012-03-22 22:33:42 +01:00
j	4c21387335	update random in transaction. timeline sorting	2012-03-22 21:19:19 +01:00
j	8511769885	random clip sort	2012-03-22 20:40:37 +01:00
j	4f8d295099	POSTER_PRECEDENCE is a local setting, use pandora.jsonc by default	2012-03-21 22:43:06 +01:00
j	9b02269361	ips without city	2012-03-21 20:56:57 +01:00
j	105e91d6dd	location sort, fixes #701 user agent string fixes #704, #702 user ox for country name fixes #705 system/user agent sort should be case insensitve fixes #706	2012-03-21 20:42:42 +01:00
j	22c5e10672	random can be NULL for now	2012-03-21 20:39:26 +01:00
j	53441142e4	use ox.parse_useragent, fixed #697 and make undefined values null, fixes #699	2012-03-21 14:44:43 +01:00
rolux	de57e52c55	friend can now access the "size" sort key	2012-03-21 13:39:36 +00:00
rolux	8f529d68d3	keep friends from seeing extra item views, but allow them to see list sizes	2012-03-21 09:36:11 +00:00
j	11b0a06107	typo, fixes #693	2012-03-21 09:13:38 +01:00
j	8a7dbf46ca	fix users dialog	2012-03-20 20:34:26 +01:00
rolux	4651349381	escape quotes in config jsonc	2012-03-20 19:23:15 +00:00
rolux	a1cb1fe479	update 0xdb.jsonc	2012-03-20 18:31:52 +00:00
j	b55e1db153	save numberoflists in session table, fixes #687	2012-03-20 19:38:18 +01:00
j	37117407b0	save channel only once	2012-03-20 17:23:13 +01:00
j	72e7f0dc09	admin newsletter	2012-03-19 20:20:11 +01:00
rolux	a64a31a96f	update 0xDB.jsonc (name, e-mail, footer)	2012-03-18 21:58:39 +00:00
rolux	21fc25e7fd	update timeline names	2012-03-17 06:31:34 +00:00
j	cff5652853	first round of browser based upload	2012-03-17 01:15:06 +01:00
j	65943df3f8	support adding files without archive	2012-03-16 17:18:26 +01:00
j	da5343715a	better multiline srt export	2012-03-16 17:16:02 +01:00
j	cd46c456af	fix autocomplete	2012-03-13 13:39:43 +01:00
j	c686a6ebe9	fix cut detection	2012-03-12 14:18:11 +01:00
j	0284635805	enable multithreading for server side transcodes	2012-03-12 13:24:11 +01:00
j	cfd7d6a4d9	filter	2012-03-11 21:56:01 +01:00
j	c659ff961b	dont call manager, use get	2012-03-11 21:33:17 +01:00
j	a214d4ec7c	better unicode representation of items	2012-03-10 18:29:46 +01:00
j	931aeaf130	dont call item.save() in poster update, this causes data loss	2012-03-10 02:46:26 +01:00
j	558306a629	dont look over places/events if empty annotation	2012-03-10 02:33:03 +01:00
j	80cb9c8faf	fix name duplicating Foo [2] fixes #535 ... copy all items not just first 100 duplicating a static list	2012-03-10 01:23:44 +01:00
j	69cbee4bd5	only return visible clips. fixes #625	2012-03-10 00:55:45 +01:00
j	05a30e162c	typo	2012-03-09 23:57:17 +01:00
j	2ae9035a37	places too	2012-03-09 23:53:52 +01:00
j	4969719231	newlines	2012-03-09 23:47:36 +01:00
j	4f16b59458	find matches accros newlines	2012-03-09 23:37:54 +01:00
j	5c439828ea	order poster frames, fixes #409	2012-03-09 22:08:17 +01:00
j	0e8722018b	google translate breaks the page, disable it	2012-03-09 21:01:23 +01:00
j	42486c885e	dont update sort/find while import subtitles	2012-03-09 19:27:28 +01:00
j	50ad006359	no json debug be default	2012-03-09 13:35:14 +01:00