The following changes since commit fe7377548ef5c154bfd1c6d2c170e6257b048320: Fixed operator precedence bug (2011-07-06 04:28:06 +0000) are available in the git repository at: http://git.decadent.org.uk/git/pentabarf.git master One bug fix, then some more significant changes to support concatenation of multiple recording segments for a single event. Please review and pull if acceptable. Since the above repository is not available over SSL, I'll state here that the branch head is 48bd922f9ae1c05ea72671539710e2e33077ee31. The related database changes are available from: svn+ssh://svn.debian.org/svn/debconf-video/package/trunk/conf/dc-video-schema-upgrade.sql Ben. Ben Hutchings (4): Fix matching of video target file base name prefix > 3 digits Add models for video_event and video_event_view Update video controller and views for concatenation of recordings Lock video events and recordings while under review rails/app/controllers/video_controller.rb | 89 ++++++++++++++++++++++++++--- rails/app/models/video_event.rb | 3 + rails/app/models/video_event_view.rb | 3 + rails/app/views/video/associate.rxml | 9 ++- rails/app/views/video/link_to_event.rxml | 13 ++++- rails/app/views/video/list_events.rxml | 21 +++++++ rails/app/views/video/transcodings.rxml | 78 +++++++++++-------------- 7 files changed, 159 insertions(+), 57 deletions(-) create mode 100644 rails/app/models/video_event.rb create mode 100644 rails/app/models/video_event_view.rb -- Ben Hutchings Absolutum obsoletum. (If it works, it's out of date.) - Stafford Beer
Attachment:
signature.asc
Description: This is a digitally signed message part