Thu, 14 Feb 2013 12:27:49 +0100 rougeronj set tmg_username and tmg_api_key for chunked_uploads in create_content template chunked_upload
Tue, 12 Feb 2013 17:30:41 +0100 rougeronj Merge with b6d17223140ff462ee13c178855d63131f063752 chunked_upload
Tue, 12 Feb 2013 17:29:41 +0100 rougeronj add js et css for chunked_upload module chunked_upload
Fri, 08 Feb 2013 15:48:25 +0100 rougeronj remove JqXHR endpoint chunked_upload
Sun, 10 Feb 2013 23:04:28 +0100 ymh Added tag V01.49 for changeset e590a85b91cc
Sun, 10 Feb 2013 23:03:44 +0100 ymh New version 1.49 V01.49
Sun, 10 Feb 2013 23:03:11 +0100 ymh correct serialization pb
Fri, 08 Feb 2013 17:21:27 +0100 grandjoncl change on the embed popup configuration to have a checkbox autostart
Fri, 08 Feb 2013 16:44:17 +0100 veltr Metadataplayer bugfixes
Thu, 07 Feb 2013 13:47:34 +0100 ymh Added tag V01.48 for changeset 56c6497c0785
Thu, 07 Feb 2013 13:47:20 +0100 ymh new version V01.48
Thu, 07 Feb 2013 13:41:49 +0100 ymh Requests optimisations
Wed, 06 Feb 2013 14:33:29 +0100 rougeronj init nb_segment to 0, to prevent error while making an empty research
Wed, 06 Feb 2013 14:28:16 +0100 rougeronj prevent submit if uploading chunked_upload
Wed, 06 Feb 2013 14:26:37 +0100 rougeronj minor modifications in callbacks chunked_upload
Fri, 01 Feb 2013 16:07:10 +0100 cavaliet Added tag V00.21.3 for changeset d9f361430091 maintenance_0.21
Fri, 01 Feb 2013 16:06:54 +0100 cavaliet add version number in maintenance branch maintenance_0.21 V00.21.3
Fri, 01 Feb 2013 15:53:10 +0100 cavaliet update ldt.swf for regardssignes maintenance_0.21
Fri, 01 Feb 2013 15:48:39 +0100 cavaliet update ldt.swf
Fri, 25 Jan 2013 18:49:07 +0100 veltr MDP bugfix
Fri, 25 Jan 2013 18:17:18 +0100 veltr Metadataplayer Upgrade
Wed, 23 Jan 2013 18:16:16 +0100 ymh Closing branch: modifications_relative_ldtxml modifications_relative_ldtxml
Wed, 23 Jan 2013 18:14:24 +0100 ymh misc correction on the the migration and command
Wed, 23 Jan 2013 17:19:56 +0100 ymh Merge with cb83b868164a4795345f7a87ad9291c97725740d
Tue, 22 Jan 2013 13:07:37 +0100 cavaliet Added tag V01.47 for changeset 86dbc665226d
Tue, 22 Jan 2013 13:07:24 +0100 cavaliet update version number to 1.47 V01.47
Tue, 22 Jan 2013 13:03:55 +0100 ymh Merge with a11c8dba822ec3172cfab78ef1d8554cb1227df0
Tue, 22 Jan 2013 13:03:10 +0100 ymh add command to sync the iri file, recreating them if necessary
Tue, 22 Jan 2013 12:44:42 +0100 cavaliet correct add_segment in annotation api. version number upgraded to 1.46.
Tue, 22 Jan 2013 11:25:55 +0100 ymh Small corrections
Tue, 22 Jan 2013 09:41:36 +0100 ymh optimize adding an annotation
Mon, 21 Jan 2013 17:33:05 +0100 ymh Merge with 605bfa632c6791647b2d026dce72ddd176c5f141
Mon, 21 Jan 2013 17:26:18 +0100 ymh Add an argument to project save to avoid indexation
Thu, 17 Jan 2013 15:24:34 +0100 cavaliet Added tag V01.46 for changeset e1b6be4d85a4
Thu, 17 Jan 2013 12:54:18 +0100 veltr Updated Metadataplayer V01.46
Thu, 17 Jan 2013 11:35:19 +0100 cavaliet api : avoid PUT request with a list of projects.
Wed, 16 Jan 2013 05:34:32 +0100 ymh Added tag V01.45 for changeset 62be1eedf908
Wed, 16 Jan 2013 05:34:21 +0100 ymh Create version 1.45 V01.45
Wed, 16 Jan 2013 05:33:45 +0100 ymh Allow filtering of projects on title
Wed, 16 Jan 2013 05:09:22 +0100 ymh add authentication to roject resource
Mon, 14 Jan 2013 15:48:45 +0100 rougeronj cleaning some loggin.debug
Mon, 14 Jan 2013 14:59:52 +0100 rougeronj update of translation dictionary
Mon, 14 Jan 2013 14:58:03 +0100 rougeronj update LdtDurationField to correctly test if the value is an integer, and send custom message error if it's not
Mon, 14 Jan 2013 14:48:46 +0100 rougeronj update LdtDurationFied to send correct validation messages
Mon, 14 Jan 2013 13:27:29 +0100 rougeronj clean unused widget "LdtParseVideoDuration"
Mon, 14 Jan 2013 11:40:48 +0100 rougeronj add callback functions to communicate with jquery.chunked_uploads chunked_upload
Wed, 09 Jan 2013 15:32:52 +0100 cavaliet Added tag V01.44 for changeset 996bb5b1adbc
Wed, 09 Jan 2013 15:32:13 +0100 cavaliet update version to 1.44 V01.44
Wed, 09 Jan 2013 15:31:33 +0100 cavaliet remove useless log
Tue, 08 Jan 2013 12:39:34 +0100 cavaliet correct sort in mashupbytag
Mon, 07 Jan 2013 17:01:02 +0100 cavaliet avoid doubloon in mashuptag
Mon, 07 Jan 2013 16:06:59 +0100 rougeronj cleaning some console.log chunked_upload
Mon, 07 Jan 2013 16:00:43 +0100 Julien Rougeron adds chunked upload endpoints and callback function for video url chunked_upload
Mon, 07 Jan 2013 15:58:48 +0100 Julien Rougeron cleaning of old upload-related functions chunked_upload
Mon, 07 Jan 2013 15:50:28 +0100 cavaliet add title sort after weight sort (correction)
Mon, 07 Jan 2013 15:37:49 +0100 cavaliet add title sort after weight sort
Fri, 04 Jan 2013 17:23:16 +0100 cavaliet Added tag V01.43 for changeset c4d6ddd5f718
Fri, 04 Jan 2013 17:23:01 +0100 cavaliet update version number to 1.43 V01.43
Fri, 04 Jan 2013 17:13:54 +0100 cavaliet correct tagging for segment.
Wed, 02 Jan 2013 17:21:19 +0100 grandjoncl solve some problems of css for the create content page (modifications in forms.py and ldtform.css) modifications_relative_ldtxml
Thu, 20 Dec 2012 15:22:42 +0100 grandjoncl modifications to have relative src for media in the xml ldt of a project. modifications_relative_ldtxml
Thu, 20 Dec 2012 15:12:51 +0100 grandjoncl Starting 'modifications_relative_ldtxml' branch modifications_relative_ldtxml
Wed, 02 Jan 2013 17:03:20 +0100 rougeronj start integration of chunked_upload in create content chunked_upload
Fri, 14 Dec 2012 15:16:51 +0100 rougeronj create_content merge correction chunked_upload
Fri, 14 Dec 2012 15:12:39 +0100 rougeronj Merge with 9bd66b69effcadeb1fb421529b836814911c80aa chunked_upload
Thu, 06 Dec 2012 14:39:14 +0100 rougeronj load chunked_upload scripts after DOM chunked_upload
Mon, 03 Dec 2012 16:46:24 +0100 rougeronj first version of chunked_upload chunked_upload
Fri, 30 Nov 2012 17:22:18 +0100 rougeronj Starting 'chunked_upload' branch chunked_upload
Fri, 28 Dec 2012 14:19:01 +0100 cavaliet correct language files.
Fri, 28 Dec 2012 11:28:45 +0100 cavaliet delete annotation when you are admin, and import cleaning.
Wed, 19 Dec 2012 19:08:34 +0100 veltr Metadataplayer improvements (mostly for embeds)
Wed, 19 Dec 2012 16:35:57 +0100 ymh Added tag V01.42 for changeset 726f2cf3f020
Wed, 19 Dec 2012 16:35:43 +0100 ymh new version for theend V01.42
Fri, 14 Dec 2012 18:56:00 +0100 cavaliet remove zero duration annotations parameter added in mashupbytag.
Fri, 14 Dec 2012 17:48:30 +0100 cavaliet enable remove unused annotations in mashupbytag
Thu, 13 Dec 2012 17:42:29 +0100 cavaliet Added tag V01.41 for changeset 57bb8c9fe1ff
Thu, 13 Dec 2012 17:42:17 +0100 cavaliet update version number to 1.41. V01.41
Thu, 13 Dec 2012 17:27:20 +0100 cavaliet add dumpdata view in ldt_utils admin.
Thu, 13 Dec 2012 14:33:48 +0100 veltr Corrected Mediafragment in Metadataplayer
Wed, 12 Dec 2012 17:49:57 +0100 cavaliet sort by weight for mashupbytag
Wed, 12 Dec 2012 13:12:01 +0100 cavaliet add weight to api tag search
Tue, 11 Dec 2012 11:15:35 +0100 cavaliet Added tag V01.40 for changeset 7fa1389a1d1d
Mon, 10 Dec 2012 15:19:57 +0100 grandjoncl default : segments widget is true V01.40
Mon, 10 Dec 2012 11:03:34 +0100 grandjoncl modification of embed too be more userfriendly
Thu, 06 Dec 2012 14:53:18 +0100 rougeronj minor correction to avoid error when search result is empty (initialise var)
Thu, 06 Dec 2012 14:48:20 +0100 rougeronj minor correction to avoid error when search result is empty
Wed, 05 Dec 2012 13:22:49 +0100 ymh Added tag V01.39 for changeset 0897d4ffdbc9
Wed, 05 Dec 2012 13:22:33 +0100 ymh correct pb on cache key + version nb V01.39
Wed, 05 Dec 2012 00:12:15 +0100 ymh Added tag V01.38 for changeset 5a9f718115d3
Tue, 04 Dec 2012 15:55:48 +0100 ymh small variable correction and update version V01.38
Tue, 04 Dec 2012 13:56:29 +0100 cavaliet Merge with 09d29a596d4959bfa4dcc4918c189ae251bcfec4
Tue, 04 Dec 2012 13:55:35 +0100 cavaliet remove useless template and unused import.
Tue, 04 Dec 2012 13:43:30 +0100 ymh remove unnecessary file + small update on setup
Tue, 04 Dec 2012 13:41:14 +0100 grandjoncl clean import
Tue, 04 Dec 2012 13:33:23 +0100 grandjoncl modification of get_web_url to have less dependances and be usable in ldt_utils->models
Tue, 04 Dec 2012 13:11:19 +0100 grandjoncl correction of a big bug concerning the get_web_url call in models
Mon, 03 Dec 2012 16:16:29 +0100 grandjoncl correction of a small error in the iframe_url in workspace
Mon, 03 Dec 2012 16:12:53 +0100 grandjoncl creation of a function in order to avoid using settings.WEB_URL + reverse in the views. Function to get the web_url using site domain
Mon, 03 Dec 2012 11:53:01 +0100 ymh Added tag V01.37 for changeset a6a37775a76d
Mon, 03 Dec 2012 11:27:35 +0100 grandjoncl Merge with 0b8497f071d10d521b4a136368f2c65fab05aed5
Mon, 03 Dec 2012 11:20:29 +0100 grandjoncl Merge with f0948f50816be925555b82b377d17c6273dacc97
Wed, 28 Nov 2012 12:31:27 +0100 grandjoncl Merge with 8251c6a02d6fc48c19f241f8055ceac0017ac457
Mon, 03 Dec 2012 11:03:40 +0100 grandjoncl modification of initsitedomain command and migration to work when the web_url doesn't start with 'http://'
Mon, 03 Dec 2012 10:43:13 +0100 grandjoncl Merge with 563d51c73231d32df2ed1ffce38449ef23fde80f
Fri, 30 Nov 2012 11:51:56 +0100 grandjoncl change for the migration to change site domain
Fri, 30 Nov 2012 10:24:12 +0100 grandjoncl new command : when we want to use an other database, we can run that command with "python manage.py initsitedomain" and this will set the domain to the right value in the django-site table
Wed, 28 Nov 2012 16:57:50 +0100 grandjoncl correction of absstatic import
Wed, 28 Nov 2012 16:40:18 +0100 grandjoncl change of method to have absolute url for static file in views
Wed, 28 Nov 2012 12:31:27 +0100 grandjoncl Merge with 8251c6a02d6fc48c19f241f8055ceac0017ac457
Wed, 28 Nov 2012 12:27:08 +0100 grandjoncl new template tag absstatic to have absolute url for static file and avoid using LDT_MEDIA_PREFIX
Sat, 01 Dec 2012 02:15:38 +0100 ymh increase version number after correction on content creation V01.37
Fri, 30 Nov 2012 16:43:13 +0100 rougeronj cancel chunked_upload changes
Fri, 30 Nov 2012 16:40:26 +0100 rougeronj Merge with 9f7680957db8f7501d7d48a304545c0920b45349
Fri, 30 Nov 2012 16:26:23 +0100 rougeronj Bug correction while creating content with a "not clean" url
Fri, 30 Nov 2012 11:59:47 +0100 rougeronj start integration of chunk upload
Fri, 16 Nov 2012 17:35:46 +0100 rougeronj add unit test for unix os to test creation of contents without writing/reading permissions
Mon, 12 Nov 2012 16:00:15 +0100 rougeronj add some unit test. Update content organization
Fri, 30 Nov 2012 13:35:32 +0100 ymh Added tag V01.36 for changeset 89e3320ac56c
Fri, 30 Nov 2012 13:31:27 +0100 ymh Added tag V01.36 for changeset a774af5e10f4 V01.36
Fri, 30 Nov 2012 13:31:02 +0100 ymh New version after correction on encoding
Fri, 30 Nov 2012 13:30:51 +0100 cavaliet Merge with c8b0dd68528b17c5fc4b7709bb742e17317b2cc1
Fri, 30 Nov 2012 13:28:46 +0100 cavaliet debug content view and enhance project api save.
Fri, 30 Nov 2012 13:19:44 +0100 veltr Merge with de6f5b3ee200b79ba3e20f1bc14a65a1ac6d21e6
Fri, 30 Nov 2012 13:19:03 +0100 veltr URI Decode Correction
Fri, 30 Nov 2012 12:27:17 +0100 ymh Added tag V01.35 for changeset a05ad02125c5
Fri, 30 Nov 2012 12:26:51 +0100 ymh new version to integrate the changes form raphael V01.35
Fri, 30 Nov 2012 11:51:03 +0100 veltr Corrected MDP Bugs
Thu, 29 Nov 2012 23:03:22 +0100 ymh Added tag V01.34 for changeset 659ca382a67d
Thu, 29 Nov 2012 23:03:09 +0100 ymh version 1.34 after split V01.34
Thu, 29 Nov 2012 01:34:42 +0100 ymh update distibute and ignore fiels
Thu, 29 Nov 2012 00:15:01 +0100 ymh split repository. keep only src
Mon, 26 Nov 2012 18:56:46 +0100 ymh Added tag V01.33 for changeset 41eb88128c8f
Mon, 26 Nov 2012 18:56:17 +0100 ymh add ordering option to content resource V01.33
Mon, 26 Nov 2012 16:17:33 +0100 ymh Added tag V01.33 for changeset caa3a2695cb7
Mon, 26 Nov 2012 16:05:14 +0100 ymh allow filtering on contents title
Sat, 24 Nov 2012 15:16:00 +0100 ymh new version
Fri, 23 Nov 2012 15:02:45 +0100 veltr Updates for KC
Fri, 23 Nov 2012 12:03:47 +0100 cavaliet bug #43 : https media url now accepted.
Fri, 23 Nov 2012 11:46:25 +0100 cavaliet tag filter added to content api.
Fri, 23 Nov 2012 11:13:11 +0100 cavaliet add media url to content api.
Thu, 22 Nov 2012 23:55:43 +0100 ymh Added tag V01.32 for changeset 10b2e464af09
Thu, 22 Nov 2012 23:55:31 +0100 ymh new version 1.32 V01.32
Wed, 21 Nov 2012 16:33:26 +0100 veltr New Search in Metadataplayer
Fri, 16 Nov 2012 18:37:23 +0100 ymh Added tag V01.31 for changeset ba35e8803c76
Fri, 16 Nov 2012 17:12:08 +0100 ymh Correct filtering option, ALL is not 'ALL' V01.31
Fri, 16 Nov 2012 17:02:18 +0100 ymh add filtering options
Fri, 16 Nov 2012 16:55:20 +0100 ymh increase version number
Fri, 16 Nov 2012 18:09:11 +0100 veltr Merge with 8aedef0c12e112d36a97890eadd6c570174fb419
Fri, 16 Nov 2012 18:08:48 +0100 veltr Another Widget Bugfix
Fri, 16 Nov 2012 18:02:27 +0100 cavaliet api for tag 1st version.
Fri, 16 Nov 2012 17:39:03 +0100 veltr Bugfix in MDP
Fri, 16 Nov 2012 17:31:59 +0100 veltr Annotation Widget Bugfix
Fri, 16 Nov 2012 17:08:05 +0100 veltr Merge with f08d8b3e78b80839fdc6c2350cf2dd4e19f820cd
Fri, 16 Nov 2012 17:07:19 +0100 veltr Added Multi-Segment Widget
Fri, 16 Nov 2012 16:44:27 +0100 ymh Correct authentication on projects
Fri, 16 Nov 2012 15:22:45 +0100 grandjoncl correction of user page, we can now change informations as name, first name...
Thu, 15 Nov 2012 15:15:37 +0100 cavaliet cinelab serializer validator.
Thu, 15 Nov 2012 00:23:46 +0100 ymh Added tag V01.30 for changeset d49f0e0e0a52
Wed, 14 Nov 2012 17:44:46 +0100 veltr Updted KC Widget V01.30
Wed, 14 Nov 2012 15:18:46 +0100 veltr Update Knowledge Concierge with Related Videos
Wed, 14 Nov 2012 16:44:07 +0100 ymh add front poroject to resource
Tue, 13 Nov 2012 17:38:43 +0100 ymh Added tag V01.30 for changeset 19fb9bcc6bc5
Tue, 13 Nov 2012 17:38:29 +0100 ymh new version
Tue, 13 Nov 2012 16:36:24 +0100 veltr Update Metadataplayer - Added KC widget
Tue, 13 Nov 2012 12:34:51 +0100 grandjoncl correction when selecting automatically the embed code
Tue, 13 Nov 2012 10:25:14 +0100 grandjoncl correction of embed popup : the preset modes block used to "disappear" when we changed div or iframe integration mode
Mon, 12 Nov 2012 18:56:04 +0100 cavaliet correct po/mo merge problem.
Mon, 12 Nov 2012 18:39:55 +0100 cavaliet Merge with 170da3907040476932f14daf873b23f2d9ef691d
Mon, 12 Nov 2012 18:33:09 +0100 cavaliet Merge with 7d0b9d12bf5aba6ba6189cdc6e91532e83a4e3a3
Mon, 12 Nov 2012 18:26:38 +0100 cavaliet little debug
Mon, 12 Nov 2012 17:39:44 +0100 cavaliet little serializer debug.
Mon, 12 Nov 2012 16:37:57 +0100 grandjoncl Closing branch: embed_config embed_config
Mon, 12 Nov 2012 16:22:33 +0100 grandjoncl Merge with 3d525c04fc7270c950e7cce4041a885f609e8173
Mon, 12 Nov 2012 16:17:22 +0100 grandjoncl Merge with e107b22256805bd992817fc0161f0611235eff51
Mon, 12 Nov 2012 15:03:36 +0100 grandjoncl configuration of embed code over embed_config
Thu, 08 Nov 2012 17:59:14 +0100 grandjoncl embed_config almost over embed_config
Tue, 06 Nov 2012 10:52:51 +0100 grandjoncl amelioration iframe embed embed_config
Tue, 06 Nov 2012 10:12:47 +0100 grandjoncl Starting 'embed_config' branch embed_config
Mon, 12 Nov 2012 16:16:51 +0100 cavaliet Debug and corrections on api.
Mon, 12 Nov 2012 13:28:31 +0100 ymh - secure access to content and project
Fri, 09 Nov 2012 18:31:13 +0100 ymh Added tag V01.29 for changeset d42fbe878062
Fri, 09 Nov 2012 18:23:40 +0100 ymh new version number V01.29
Fri, 09 Nov 2012 18:22:43 +0100 ymh correct bug on indexation.
Fri, 09 Nov 2012 17:46:21 +0100 ymh add recommende content api
Fri, 09 Nov 2012 15:58:04 +0100 cavaliet Django session authentication for project post api.
Fri, 09 Nov 2012 15:12:10 +0100 veltr Bugfix on Sparkline
Fri, 09 Nov 2012 14:47:56 +0100 veltr Sparkline correction
Thu, 08 Nov 2012 17:57:31 +0100 rougeronj split of write_content_base function : media management put in media_management() function
Thu, 08 Nov 2012 16:25:01 +0100 rougeronj update error management in content creation
Thu, 08 Nov 2012 16:10:08 +0100 cavaliet Little error treatment in search result.
Thu, 08 Nov 2012 16:02:31 +0100 cavaliet projects pushed by api published by default.
Thu, 08 Nov 2012 15:28:22 +0100 cavaliet close new_rest_api branch new_rest_api
Thu, 08 Nov 2012 15:27:18 +0100 cavaliet End cinelab json to ldt xml serializer. Now deserialize edits/mashup.
Wed, 07 Nov 2012 17:52:14 +0100 cavaliet first step of the json cinelab to xml ldt serializer. Eveything works but edits.
Wed, 07 Nov 2012 16:25:16 +0100 ymh Added tag V01.28 for changeset e20fa6533647
Wed, 07 Nov 2012 16:24:35 +0100 ymh Correct virtualenv creation V01.28
Wed, 07 Nov 2012 11:50:02 +0100 ymh Remove warnings
Tue, 06 Nov 2012 18:45:13 +0100 veltr AutoPlayer/AdaptivePlayer bugfix
Tue, 06 Nov 2012 18:00:21 +0100 ymh Added tag V01.28 for changeset 7be50692abb4
Tue, 06 Nov 2012 17:59:59 +0100 ymh Correct web_auth to be a list to respect regex order
Tue, 06 Nov 2012 17:01:24 +0100 ymh Added tag V01.28 for changeset ba43c842648c
Tue, 06 Nov 2012 17:01:10 +0100 ymh Correct default value of WEB_AUTH
Tue, 06 Nov 2012 16:23:50 +0100 ymh Added tag V01.28 for changeset be9868b4b13d
Tue, 06 Nov 2012 16:05:19 +0100 ymh Added tag V01.28 for changeset ba611074ecb2
Tue, 06 Nov 2012 16:04:56 +0100 ymh Clean import and some unused variables
Tue, 06 Nov 2012 15:52:04 +0100 rougeronj cleaning test logging message
Tue, 06 Nov 2012 14:58:51 +0100 rougeronj update of error management in the creation of content
Tue, 06 Nov 2012 14:56:18 +0100 ymh Prepare new version
Tue, 06 Nov 2012 14:40:44 +0100 ymh add correction for platform instance which are protected by a basic http login/password.
Tue, 06 Nov 2012 13:56:54 +0100 cavaliet Merge with bd5f9dea97910caae6c2fb1ef8fc2e119e47d248
Tue, 06 Nov 2012 13:55:56 +0100 cavaliet Prepare Project POST api.
Tue, 06 Nov 2012 11:57:19 +0100 grandjoncl Embed code popup modified in order to be abble to display html5 player
Tue, 06 Nov 2012 10:59:02 +0100 veltr Adapted Metadataplayer to REST API changes
Mon, 05 Nov 2012 19:15:12 +0100 veltr Updated AutoPlayer
Mon, 05 Nov 2012 18:48:47 +0100 cavaliet Merge with 77d216688495e4ce442401352310bb932f50fbdc
Mon, 05 Nov 2012 18:46:29 +0100 cavaliet update annotation push with post request (not put anymore)
Mon, 05 Nov 2012 16:16:19 +0100 rougeronj Unit test Update
Mon, 05 Nov 2012 15:20:11 +0100 cavaliet Merge with 31770c3f29faa1b2b8c23e0a1ea8c7e801a0af0f
Mon, 05 Nov 2012 15:19:24 +0100 cavaliet add to_cinelab serializer to api
Tue, 30 Oct 2012 11:30:25 +0100 rougeronj Unit test
Thu, 25 Oct 2012 11:43:01 +0200 rougeronj Update of ldt_utils unit test
Fri, 19 Oct 2012 16:10:22 +0200 rougeronj Merge with 2ade832d146239bf9f24105a93cf7abb023f3daa
Fri, 19 Oct 2012 16:08:42 +0200 rougeronj Add of unit test for ldt_utils
Tue, 16 Oct 2012 17:26:49 +0200 rougeronj removing groups popup from js file
Tue, 16 Oct 2012 17:24:01 +0200 rougeronj remove group creation/modification popup
Mon, 29 Oct 2012 12:04:20 +0100 cavaliet Merge with new rest api branch 4a5c5436844758a727f4c060d2e8e5a2c90a81d1
Fri, 26 Oct 2012 18:38:28 +0200 veltr Adapted Metadataplayer to send Title and Description new_rest_api
Fri, 26 Oct 2012 16:32:30 +0200 cavaliet Update annotation put api format with title and description. (and remove useless import) new_rest_api
Fri, 26 Oct 2012 16:17:08 +0200 cavaliet correct segment tag parsing and remove useless import. new_rest_api
Fri, 26 Oct 2012 15:52:17 +0200 veltr Metadataplayer upgraded for rest api new_rest_api
Wed, 24 Oct 2012 11:19:42 +0200 cavaliet correct url in template new_rest_api
Mon, 22 Oct 2012 18:30:38 +0200 cavaliet remove unused import new_rest_api
Mon, 22 Oct 2012 18:28:15 +0200 cavaliet update venv settings and dependencies new_rest_api
Mon, 22 Oct 2012 18:22:39 +0200 cavaliet first commit with new rest api urls and resources. new_rest_api
Mon, 22 Oct 2012 18:19:12 +0200 cavaliet Starting 'new_rest_api' branch new_rest_api
Sun, 21 Oct 2012 22:48:17 +0200 ymh update django
Fri, 19 Oct 2012 14:49:02 +0200 grandjoncl Merge with 429ab4f4b82347c3ba4ca0ac36d854ac1715a190
Fri, 19 Oct 2012 14:47:27 +0200 grandjoncl change of 500 error page
Fri, 19 Oct 2012 01:16:38 +0200 ymh Added tag V01.27 for changeset 2151b47c58c3
Fri, 19 Oct 2012 01:16:23 +0200 ymh update version V01.27
Fri, 19 Oct 2012 01:01:44 +0200 ymh Added tag V01.26 for changeset 3eae57bb42b3
Fri, 19 Oct 2012 01:01:27 +0200 ymh correct ref to tagging settings V01.26
Thu, 18 Oct 2012 17:37:32 +0200 ymh Added tag V01.26 for changeset 36d8d68fda81
Thu, 18 Oct 2012 17:37:10 +0200 ymh new version
Thu, 18 Oct 2012 10:42:44 +0200 grandjoncl Images and templates for the error pages
Thu, 18 Oct 2012 10:41:49 +0200 grandjoncl Creation of error pages 404, 403, 500
Wed, 17 Oct 2012 17:01:21 +0200 ymh Add logging setup
Tue, 16 Oct 2012 13:14:56 +0200 grandjoncl css modifications for embed_popup
Tue, 16 Oct 2012 00:03:48 +0200 ymh update locale
Mon, 15 Oct 2012 23:48:25 +0200 ymh Merge with a233a5a00aabf7377ed98d2a067c1f26a93691e7
Mon, 15 Oct 2012 23:48:01 +0200 ymh correct admin.
Mon, 15 Oct 2012 10:34:10 +0200 ymh force tagging tag length field to be 255.
Sun, 14 Oct 2012 13:31:34 +0200 ymh solve pb with logging and tags
Thu, 11 Oct 2012 19:54:35 +0200 ymh Added tag V01.25 for changeset 96b7309ae220
Thu, 11 Oct 2012 19:53:22 +0200 ymh Tag 1.25 V01.25
Thu, 11 Oct 2012 19:52:33 +0200 ymh update translations
Mon, 15 Oct 2012 10:59:04 +0200 grandjoncl css corrections for embed_popup
Thu, 11 Oct 2012 19:03:50 +0200 ymh update japanese after merge
Thu, 11 Oct 2012 18:59:38 +0200 ymh Merge with 1f69157772a16a6761938baaf89fe82d2467f231
Thu, 11 Oct 2012 18:59:08 +0200 ymh add japanese
Thu, 11 Oct 2012 18:18:07 +0200 rougeronj bug correction on creation of content
Thu, 11 Oct 2012 18:09:32 +0200 rougeronj Bug correction on deletion content. Bug correction : forbidden_stream_url was saved in the xml of the project
Thu, 11 Oct 2012 16:39:05 +0200 grandjoncl Corrections of the code for the embed popup. Functions are now in the embed_popup.js
Wed, 10 Oct 2012 18:07:40 +0200 rougeronj Merge with b38c88bdefa2b95fd3817872131694960f5468a0
Wed, 10 Oct 2012 18:00:00 +0200 rougeronj Creation and deletion of content, iri file, and thumbnail are now transactional
Wed, 10 Oct 2012 17:55:18 +0200 grandjoncl Radio button to choose between div and iframe embed code.
Wed, 10 Oct 2012 16:19:10 +0200 cavaliet change add group icon #18
Mon, 08 Oct 2012 16:31:31 +0200 cavaliet Added tag V01.24 for changeset f8bd692229d7
Mon, 08 Oct 2012 16:31:07 +0200 cavaliet prepare V01.24 V01.24
Mon, 08 Oct 2012 12:42:43 +0200 rougeronj Fix bug when searching group in the project form
Mon, 08 Oct 2012 12:38:52 +0200 grandjoncl Merge with 20acf3b3b2f00d45d1e423b92dc31874fd90afbf
Mon, 08 Oct 2012 12:34:11 +0200 grandjoncl Embed code corrections : jsonp problem solved, complete adresses in embed_player, display metadataplayer on click when needed, select code on button click, iframe code available in the embed popup
Sat, 06 Oct 2012 00:40:42 +0200 ymh Merge with c8126f9ce2b18d7be3f5491af69fb85bbc5df063
Thu, 20 Sep 2012 17:06:25 +0900 ymh update distribute
Thu, 20 Sep 2012 15:33:55 +0900 ymh replace faulty archives files
Thu, 20 Sep 2012 15:13:53 +0900 ymh update virtualenv
Fri, 05 Oct 2012 16:35:38 +0200 veltr Added tooltop on polemic keywords
Fri, 05 Oct 2012 16:17:07 +0200 veltr Removed default tags
Thu, 04 Oct 2012 19:07:33 +0200 veltr MDP bugfix
Thu, 04 Oct 2012 16:16:59 +0200 cavaliet Added tag V01.23 for changeset 626573ed450f
Thu, 04 Oct 2012 16:15:47 +0200 cavaliet Removed tag V01.23 V01.23
Thu, 04 Oct 2012 16:13:50 +0200 cavaliet commit V01.23
Thu, 04 Oct 2012 16:05:01 +0200 cavaliet Added tag V01.23 for changeset ca8127a4cdd5
Thu, 04 Oct 2012 16:02:30 +0200 cavaliet add iframe annotation list feature.
Thu, 04 Oct 2012 12:17:41 +0200 cavaliet Merge with 1762d071100840e538d715593197965db9075680
Thu, 04 Oct 2012 12:17:09 +0200 cavaliet enhance iframe embed parameters.
Thu, 04 Oct 2012 11:42:02 +0200 rougeronj Add a custom duration field for the create content form
Wed, 03 Oct 2012 16:00:23 +0200 cavaliet add iframe url for metadaplayer
Tue, 02 Oct 2012 14:27:17 +0200 veltr MDP bugfix
Tue, 02 Oct 2012 13:06:27 +0200 veltr Updated Metadataplayer -- Added Adaptive Player
Mon, 01 Oct 2012 15:53:12 +0200 rougeronj Add "reset front project button" in the content creation/update form
Fri, 28 Sep 2012 15:37:19 +0200 cavaliet Added tag V01.22 for changeset ce22eaa7f2e3
Fri, 28 Sep 2012 15:37:05 +0200 cavaliet prepare v01.22 V01.22
Fri, 28 Sep 2012 12:36:30 +0200 cavaliet Merge with 6957287fbde75845b37550e880f96d0316f19bcc
Fri, 28 Sep 2012 12:20:10 +0200 cavaliet add audio annotation to segment api and correct reindex command.
Thu, 27 Sep 2012 12:12:57 +0200 grandjoncl Merge with 0f8e34108677aeba805493b19e89725e1aaa74a9
Thu, 27 Sep 2012 11:35:06 +0200 grandjoncl Embed_player is now the same as Raphael's version
Thu, 27 Sep 2012 11:33:07 +0200 rougeronj bug correction when trying to access a content without media
Wed, 26 Sep 2012 19:52:15 +0200 veltr Added Voice Annotation Support in MDP
Wed, 26 Sep 2012 19:46:04 +0200 veltr Segments API now includes starting timecode. Necessary because annotations often start at 00:00
Wed, 26 Sep 2012 18:02:43 +0200 grandjoncl Correction of embed code generator. It takes the youtube/vimeo/dailymotion player when possible.
Wed, 26 Sep 2012 17:35:21 +0200 grandjoncl Correction content : the priority of the default picture is the one entered by the user
Wed, 26 Sep 2012 12:11:56 +0200 rougeronj bug correction when trying to create a content with a stream media
Tue, 25 Sep 2012 18:06:40 +0200 rougeronj List group display in the "create content from"
Tue, 25 Sep 2012 15:13:12 +0200 rougeronj Add a control on checkbox: we can't check "publish for everyone" if "publish on the front" is unchecked
Tue, 25 Sep 2012 11:38:27 +0200 rougeronj Merge with 10dedc9e975d40888516c34a220fbc760e5a9525
Tue, 25 Sep 2012 11:24:52 +0200 grandjoncl Correction of error when checking or un-checking permission box
Tue, 25 Sep 2012 11:19:20 +0200 rougeronj cleaning of utils.py
Tue, 25 Sep 2012 11:13:51 +0200 rougeronj Merge with 923429f142ea9ad56150466193551c2db7208826
Tue, 25 Sep 2012 11:07:13 +0200 rougeronj Possibility to list a content on the front or not, with a private media. A media can be private, and the content public (listed or not)
Mon, 24 Sep 2012 18:37:53 +0200 veltr Updated Metadataplayer
Mon, 24 Sep 2012 11:29:35 +0200 grandjoncl Correction of a bug when the image link doesn't exist
Mon, 24 Sep 2012 11:01:39 +0200 grandjoncl Modifications in order to download the thumbnail picture and put it as default picture when creating youtube, dailymotion or vimeo contents
Thu, 20 Sep 2012 12:43:02 +0200 grandjoncl Creation of a page instead of pop up for the content creation, update and suppression
Thu, 20 Sep 2012 12:35:15 +0200 rougeronj Update of "reinitialize" button : Test if a content have a front_project before catching its id
Wed, 19 Sep 2012 18:16:19 +0200 rougeronj Commit Julien:
Wed, 19 Sep 2012 17:01:18 +0200 rougeronj research field modification to avoid the word "recherche" to remain in the field while clicking on it
Wed, 19 Sep 2012 22:57:33 +0900 ymh Added tag V01.21 for changeset 623bc24bee49
Wed, 19 Sep 2012 22:57:07 +0900 ymh change filter to filter_c to avoid name collision with the built-in filter fuction V01.21
Wed, 19 Sep 2012 11:25:16 +0200 grandjoncl Commit Louise-Thibaut : Correction _filter en filter dans content.py
Wed, 19 Sep 2012 15:03:51 +0900 veltr Update of the Metadataplayer
Wed, 19 Sep 2012 01:53:14 +0900 ymh Added tag V01.21 for changeset dfc0cb4355f4
Wed, 19 Sep 2012 01:53:00 +0900 ymh small correction to avoid warnings
Tue, 18 Sep 2012 16:22:11 +0200 rougeronj merge content.py des modifications de Louise et Julien
Tue, 18 Sep 2012 15:56:18 +0200 Julien Rougeron Commit Julien:
Tue, 18 Sep 2012 15:26:46 +0200 Louise Grandjonc Commit Louise :
Tue, 18 Sep 2012 15:16:39 +0900 ymh Added tag V01.21 for changeset e21aa7d839fb
Tue, 18 Sep 2012 15:15:35 +0900 ymh uodate version nb to 01.21
Tue, 18 Sep 2012 15:11:32 +0900 ymh Added tag V01.21 for changeset cb384203e925
Mon, 10 Sep 2012 09:59:58 +0200 ymh Merge with 25358caa88dc2e1cb78eb0b20188f68e76acc774
Mon, 10 Sep 2012 09:49:59 +0200 ymh correct virtualenv creation in local
Wed, 05 Sep 2012 12:46:21 +0200 grandjoncl Merge
Wed, 05 Sep 2012 12:40:22 +0200 grandjoncl merge
Wed, 05 Sep 2012 12:33:45 +0200 grandjoncl mise a jour librairies windows
Mon, 03 Sep 2012 17:24:41 +0200 grandjoncl Essai commit Louise
Fri, 31 Aug 2012 15:50:15 +0200 ymh clean config file and do some correction in the sync script.
Thu, 30 Aug 2012 15:29:09 +0200 cavaliet Added tag V01.20 for changeset c8e8c2d12ca8
Thu, 30 Aug 2012 15:28:58 +0200 cavaliet add v01.20 V01.20
Thu, 30 Aug 2012 15:26:01 +0200 cavaliet correct language files.
Thu, 30 Aug 2012 15:07:55 +0200 veltr Merge with 71f05e757973d8ec1e92022bfb789440bb642644
Thu, 30 Aug 2012 15:06:57 +0200 veltr Upgraded Metadataplayer to add Vimeo support
Thu, 30 Aug 2012 13:13:39 +0200 cavaliet Merge with 08f962473d45453bfea4ee6d47f7f5f592fb1e60
Thu, 30 Aug 2012 13:13:05 +0200 cavaliet quick search in media title in the front. Languages updated.
Thu, 30 Aug 2012 00:49:03 +0200 ymh add option to mktemp
Wed, 29 Aug 2012 23:39:37 +0200 ymh Merge with e450dff4134fa9a0b1da74d98cc52bceadbf0a47
Wed, 29 Aug 2012 23:38:49 +0200 ymh improve fabfile to correct problem with collect static
Tue, 28 Aug 2012 18:45:42 +0200 cavaliet update ldt.swf with vimeo feature.
Mon, 27 Aug 2012 13:02:38 +0200 cavaliet Added tag V01.19 for changeset a10c32ec1a7f
Mon, 27 Aug 2012 13:02:25 +0200 cavaliet add 1.19 version number. V01.19
Mon, 27 Aug 2012 13:00:16 +0200 cavaliet Merge with a98bfda6d187f61e7954de9e9500bfbdb7c39885
Mon, 27 Aug 2012 12:59:34 +0200 cavaliet allow jsonp on mashupbytag.
Mon, 27 Aug 2012 02:21:38 +0200 ymh Added tag V01.18 for changeset eb7957008faa
Mon, 27 Aug 2012 02:19:16 +0200 ymh Added tag V01.18 for changeset f8c68f292551 V01.18
Mon, 27 Aug 2012 02:17:05 +0200 ymh new version
Mon, 27 Aug 2012 02:12:12 +0200 ymh Added tag V01.18 for changeset c3b2998a8b65
Mon, 27 Aug 2012 02:10:52 +0200 ymh put migration back
Fri, 24 Aug 2012 16:44:08 +0200 cavaliet Added tag V01.17 for changeset 16ad33521f05
Fri, 24 Aug 2012 16:43:29 +0200 cavaliet V01.17 V01.17
Fri, 24 Aug 2012 16:42:35 +0200 cavaliet Merge with 45ddd94e130255ca8782e20bc51de019996e8633
Fri, 24 Aug 2012 16:39:52 +0200 cavaliet Added tag V01.16 for changeset 960e4d8d8acd
Fri, 24 Aug 2012 16:39:36 +0200 cavaliet small change and V01.16 V01.16
Sat, 11 Aug 2012 01:27:51 +0200 ymh Merge with 45d81451195884fd5e087f5517461cb777e19117
Sat, 11 Aug 2012 01:25:05 +0200 ymh update django
Thu, 09 Aug 2012 18:06:36 +0200 cavaliet Content PUT api endpoint to add an annotation to a content without giving a project id. #35
Wed, 08 Aug 2012 17:20:37 +0200 cavaliet front all medias pagination. #26
Wed, 08 Aug 2012 01:43:06 +0200 ymh Merging...
Wed, 08 Aug 2012 01:32:34 +0200 ymh Correct south migrations
Tue, 07 Aug 2012 15:40:54 +0200 ymh correct naming problem
Tue, 07 Aug 2012 15:37:43 +0200 ymh correct migration
Tue, 07 Aug 2012 18:02:40 +0200 cavaliet debug #31 #32
Tue, 07 Aug 2012 15:49:18 +0200 cavaliet little debugs #30, #33, #34
Mon, 06 Aug 2012 00:30:24 +0200 ymh correct models. Add blank to generated fields
Sun, 05 Aug 2012 15:20:29 +0200 ymh Merge with 38993be55b2b4a0ca655ec84625f413e2681fc67
Sun, 05 Aug 2012 15:18:53 +0200 ymh first step of mysql migration
Thu, 02 Aug 2012 17:04:41 +0200 cavaliet search_ldt factorization and correct template.
Thu, 02 Aug 2012 15:39:32 +0200 cavaliet correct whoosh for virtualenv 2
Thu, 02 Aug 2012 15:35:36 +0200 cavaliet correct whoosh for virtualenv
Thu, 02 Aug 2012 11:16:36 +0200 ymh add whoosh to virtualenv
Thu, 02 Aug 2012 11:01:35 +0200 ymh correct highlight
Thu, 02 Aug 2012 08:45:12 +0200 ymh improve indexation query language
Tue, 31 Jul 2012 17:45:14 +0200 ymh Merge with 2446fff2bea0dd8f373aa7a947c22d866454c4a8
Tue, 31 Jul 2012 17:44:44 +0200 ymh update virtualenv configuration to include elasticsearch elements. Elasticsearch itself still has to be installed independantly
Tue, 31 Jul 2012 17:31:52 +0200 cavaliet correct search result
Tue, 31 Jul 2012 12:38:08 +0200 ymh update lxml build parameters
Tue, 31 Jul 2012 12:13:53 +0200 ymh Merge with a25d344cb446a82c64ca6c9cc311e903d3afb90c
Tue, 31 Jul 2012 02:27:09 +0200 ymh improve highlighting management
Mon, 30 Jul 2012 19:46:40 +0200 ymh replace lucene by haystack, remove references to lucene
Mon, 23 Jul 2012 17:05:53 +0200 ymh Merge with 48bf2c83d359e1ea4ceed002dfc1e55753417011
Fri, 20 Jul 2012 12:40:08 +0200 ymh centralise les appel à lucene
Thu, 19 Jul 2012 19:21:05 +0200 ymh Remove lucene dependancies in model
Tue, 31 Jul 2012 11:51:24 +0200 cavaliet second step for mashup json (works fine but does not sort mashup by weight).
Mon, 30 Jul 2012 18:23:34 +0200 cavaliet first step for mashup json.
Wed, 25 Jul 2012 17:43:35 +0200 cavaliet Added tag V01.15 for changeset d9bfc148a887
Wed, 25 Jul 2012 17:34:33 +0200 cavaliet create version 1.15 V01.15
Wed, 25 Jul 2012 17:28:24 +0200 cavaliet Content tag cloud and filter in workspace.
Tue, 24 Jul 2012 17:16:05 +0200 cavaliet new ldt version.
Mon, 23 Jul 2012 13:51:22 +0200 cavaliet correct language files.
Fri, 20 Jul 2012 18:35:57 +0200 cavaliet remove useless code.
Fri, 20 Jul 2012 18:27:59 +0200 cavaliet Enhance pagination number.
Thu, 19 Jul 2012 12:16:47 +0200 cavaliet Added tag V01.14 for changeset 99286ab16161
Thu, 19 Jul 2012 12:01:15 +0200 cavaliet update version number V01.14
Wed, 18 Jul 2012 15:08:02 +0200 cavaliet Merge with 05f2b7c3ea04156213e02cd9045ca5ff291813d1
Wed, 18 Jul 2012 15:04:46 +0200 cavaliet Add category cloud in front and media page. Correct js pagination in workspace. Languages updated.
Thu, 12 Jul 2012 15:11:01 +0200 veltr Upgraded Metadataplayer
Wed, 11 Jul 2012 17:48:48 +0200 cavaliet template correction
Wed, 11 Jul 2012 12:20:44 +0200 veltr The classic "Karim" hack for RTMP URLs
Fri, 06 Jul 2012 18:22:28 +0200 veltr Corrected metadataplayer bug
Fri, 06 Jul 2012 15:48:37 +0200 veltr Added MDPlayer configuration options
Thu, 05 Jul 2012 19:11:12 +0200 veltr Corrections on the new Metadataplayer
Wed, 04 Jul 2012 19:20:17 +0200 veltr Tests nouveau metadataplayer
Fri, 22 Jun 2012 20:43:15 +0200 ymh small changes, improve default values for platform
Fri, 22 Jun 2012 14:01:19 +0200 ymh Added tag V01.13 for changeset dfdbe9e00aae
Fri, 22 Jun 2012 13:55:34 +0200 ymh new platform version V01.13
Fri, 22 Jun 2012 13:34:17 +0200 cavaliet update project serializer for it to serialize the first bout à bout of a ldt project.
Fri, 22 Jun 2012 11:05:07 +0200 ymh spelling correction
Fri, 15 Jun 2012 02:37:29 +0200 ymh Added tag V01.12 for changeset 619222c32ade
Fri, 15 Jun 2012 02:36:57 +0200 ymh correct chmod V01.12
Fri, 15 Jun 2012 02:34:13 +0200 ymh Added tag V01.12 for changeset ad47b20c737f
Fri, 15 Jun 2012 02:33:27 +0200 ymh check folder access
Fri, 15 Jun 2012 01:59:01 +0200 ymh Added tag V01.12 for changeset d22ac13452f5
Fri, 15 Jun 2012 01:58:48 +0200 ymh oups...
Fri, 15 Jun 2012 01:57:17 +0200 ymh Added tag V01.12 for changeset 11be1c2aae5a
Fri, 15 Jun 2012 01:57:00 +0200 ymh fast fail
Fri, 15 Jun 2012 01:55:57 +0200 ymh Added tag V01.12 for changeset 72b12d25a672
Fri, 15 Jun 2012 01:55:46 +0200 ymh options for lxml method
Fri, 15 Jun 2012 01:30:09 +0200 ymh options for lxml
Thu, 14 Jun 2012 22:33:09 +0200 ymh Added tag V01.12 for changeset fe9cfbb91909
Thu, 14 Jun 2012 22:32:13 +0200 ymh reinstall distribute
Thu, 14 Jun 2012 21:42:20 +0200 ymh Added tag V01.12 for changeset 38ed996a23d8
Thu, 14 Jun 2012 21:41:58 +0200 ymh correct virtualenv creation do not install distribute immediately
Thu, 14 Jun 2012 21:33:49 +0200 ymh Added tag V01.12 for changeset 85994294d928
Thu, 14 Jun 2012 21:33:22 +0200 ymh correct virtualenv creation again
Thu, 14 Jun 2012 18:45:26 +0200 ymh Added tag V01.12 for changeset fc56b4c9e4f3
Thu, 14 Jun 2012 18:26:25 +0200 ymh correct virtualenv creation
Thu, 14 Jun 2012 15:03:46 +0200 ymh Added tag V01.12 for changeset 40ef6aed9c20
Thu, 14 Jun 2012 15:02:39 +0200 ymh bump version
Thu, 14 Jun 2012 15:01:50 +0200 ymh improve sync script and virtualenv creation
Thu, 14 Jun 2012 10:18:38 +0200 ymh correct timezone problem
Wed, 13 Jun 2012 15:04:35 +0200 ymh Added tag V01.11 for changeset f4fed46efbde
Wed, 13 Jun 2012 15:04:18 +0200 ymh correct warnings about timezones, remove dependance on pytz V01.11
Mon, 11 Jun 2012 19:53:13 +0200 ymh Added tag V01.10 for changeset 0daa35bdb06b
Mon, 11 Jun 2012 19:53:01 +0200 ymh bump version number V01.10
Sat, 09 Jun 2012 02:08:02 +0200 ymh correct stat to work with non naive datetime
Sat, 09 Jun 2012 01:57:57 +0200 ymh add pytz to the list of lib to install in virtualenv
Fri, 08 Jun 2012 19:10:56 +0200 ymh move manage.py
Fri, 08 Jun 2012 02:47:43 +0200 ymh add setuptools to improve install on ubuntu
Fri, 08 Jun 2012 02:33:36 +0200 ymh correct absolute path in images fields. add data migration
Thu, 07 Jun 2012 18:44:08 +0200 ymh Merge with acafed2ba9601bc6900cfcf957fc1bdf24aefa05
(0) -1000 -448 tip