close branch

close branch

close branch

close branch

close branch

Touch

Merged back into default

Merged back into default

Merge with 4ae2247a59f41fc00c41431cd4bce7495ef5dfaa

Changes for Cinecast

Modifs cinecast

bugfixes

Added volume support

Transferred i18n data to widgets, corrected slider bug, added search in annotationslist

Added Internationalization

Changes for Cinecast

Integrated trace manager

Adapted Stackgraph for Cinecast

Last commit before weekend

corrections

Integration pour cinecast

Lots of changes

Corrected segments widget, added excludePattern option to tagcloud widget

Removed some console.logs + css corrections

BUGFIX: Tooltips are now positioned relative to their parent widget.

Starting implementing a trace widget

Creating a branch here was a bad idea. Sorry

commit before merge

Starting 'cinecast-traces' branch

Corrections

IE 8 compatibility (using Underscore for Map and Reduce operations)

Added compatibility with cinecast format (with get_aliased)

add allocine player, and add an full test with this allocine player.

switched to relative paths for lib inclusion.

implements the most asked for feature ever : placeholder text in the annotation creation textfield.

use href or url indiscriminately to get the source of the rtmp.

use polemic_fr instead of super-slow twitterized.json

get the annotation creation api endpoint from the settings instead of hardcoding it.

added a tutorial on how to write a plugin.

added some docs to document the signals sent by the player.

less useless code - required widgets now support defaultOptions too.

added default options for the widgets.

added some code to handle embedding in an iframe and mediafragment.

forgot to remove an image reference. It's in css now.

Merge with upstream

removed more images from the templates to put them in the css.

removed code raphv had commited erronously.

removed unused template.

move css code from js to css classes for arrowWidget.

fixed player buttons. They now use css class instead of directly refering to the images.

removed reference to ui.js

update keywords styling.

fixed an odd regression.

little clean modif.

correct url for annotations + null data on serializer

Merge with local

changed default user paths.

changed default segment icon.

DM Other

fixed bug in dailymotion player.

added some doc on how to implement a player (in french)

update the graph correctly.

Added test on Dailymotion Player

Dailymotion layering problem solved

Dailymotion player doesn't autostart video

Dailymotion long video test

Added Dailymotion support

commented unused line.

be more picky about what we get.

added tags.

WIP

WIP - trying to redo the slicewidget with raphael's idea.

fixed default slicerWidget position bug. check boundaries of created annotations.

clicking on the annotate button when the annotation creation widget is opened starts the creation of a new annotation.

added show/hide message. Removed reaction to annotateClick signal

moar checking.

temporary fix for ff.

temporary fix for firefox.

remove debugger call.

discovered a bug in jqueryui. wontfix.

highlight an annotation when mediafragment tells us so.

fixed the sliceWidget to allow selecting the whole range.

added an error screen.

changed slightly the position of the search box.

automatically insert 1px of margin between the video and the first widget.

fixed raphael's files to remove trailing colon at the end of objects to make the google closure compiler happy.

removed useless file.

fixed the option to specify an user.

small submit button fixes.

if the platform has defined an user avatar, use it when submitting the annotation.

replaced direct references to images to css classes.

moved the submit button a bit higher.

send the correct username if the user is loggedin on the platform.

trigger the seeked signal after seeking because due to a bug in jwplayer, it's not triggered when the video was paused.

more work on the youtube player.

more work on the youtube rewrite front.

first version of the youtube compatible player.

don't move the arrow widget when there's no annotation at the time.

removed a printf

same thing, for the annotationsListWidget

check if the seeked signal handler receives the seek destination argument. it it's the case, assume we're going there.

added comment.

fixed seeking bug.

parse the url received by the platform.

changed a setting.

closing branch.

fixed url generation bug.

changed the files to follow the simpler embed convention.

better defaults - paths are now computed at run-time.

determine paths at runtime instead of at compile time

Merge with upstream.

forgot debug printf.

moved the sliderWidget from percents to pixels. It now has a satisfying display.

update template config file.

Tagcloud listens to searchend

tagcloud now triggers search

Show the tagcloud widget

forget config file.

Merge with upstream

refactored the code to allow external widget to do searches.

do some boundaries checks.

redraw the widget after that an annotation has been added.

load the widget when the video has finished loading.

Search function on tagcloud widget

Merge with b7ac9cfefda44dd1827b9071dad62edf67aa1d62

Merge with 00f37b85b2e245676e96d9148315c4a3de6d7539

a minor change

changed sprites

fixed bug

added support for the polemic tweet buttons.

added a "minimize" button.

added a function to share on google plus.

fixed link bug.

added buttons for adding polemic annotations.

fixes template bug.

fixed stupid bug.

closing branch.

WIP - making links to only annotations which are not present in the opened project.

fixed a bug in a template.

changed link decoration.

separated jwplayer code from pop.js and put it into its own folder, players/.

added myself to the contributors.

Fusion avec embed-playerapi-rewrite. Added new player api to the mainline.

swapped tab for spaces.

cleared the code.

renamed a bunch of global functions.

add a switch case to use the allocine player.

changed project id.

removed useless printfs.

new, extendable api.

adapted init to use the new api.

switched build order to get IriSP.wrap available for functions in pop.js

refactoring the pop.js code.

lot of work on the ajax update front.

added a condition in case url are defined or not.

indent fix.

made the file DRYer

corrected copy pasta code.

added a method to get a list of lignes with a specified name.

this time got it right.

made the widget display itself pixel-perfectly.

WIP - nearly fixed all the bugs with the sliceWidget.js. I still have got to replicate the code for the right handle.

WIP - redoing the resize slice function. do not use.

use data from stat view when available.

cleanly the segments title.

made a function to cleanly cut a string.

allow display of html content in tooltip.

added some docs for people who would like to integrate the mdp with proprietary player

hide the slicerwidget when done.

set the duration of the cinecast annotation as a function of the total length of the media.

replaced site.js by site.js.templ.

follow mediafragment conventions for links.

some work on the demo for the festival cinecast.

fixes and debugging to the cinecast_version.

added an option to specify the granularity.

Merge with 835f5f454595a1097dc0cef85b987541c3b707ac

Added a Tag Cloud Widget and corrected Stack Graph Widget

WIP - working on ajax autoupdate of the widget.

made the stackGraphWidget send a message when hovered.

added conf for annotationListWidget.

added site.js

got rid of site.js.templ. Replaced it by site.js

added modest docs about implementing a compatible player.

added alternate json file (entre les murs project).

added parameter to specify json file to load from.

fixed stupid bug due to convoluted function

changed platform test file.

fixed annotation type bug.

added semicolons.

load raphael for the stackGraphWidget.

change line endings to unix.

Merge with raphael's modifications commited under my name.

removed useless focus statement.

Merge with bf65c3364d2db4ab904fe576de1a9d471e9923a2

Modifs StackGraphWidget (commutable Streamgraph/StackGraph)

Merge with 492d3c8d776ab2ca1b95e7197f6ba7edeb9c4dec

Created a Streamgraph Widget plus a Widget template

autofocus the search field.

fixed bug in annotation handling.

fixes bug in the way a seeked signal is sent.

use the new annotation shortening functions.

added a function to shorten an url

use mediafragment #id= instead of #a=

highlight a tweet if it corresponds to a hashtag link.

send a signal when loading an annotation from hashtag.

limit where the widget can position itself.

fixed update bug.

WIP - redrawing the sparkling when an annotation is added.

fixed a couple bugs.

redraw the list when a new annotation is added.

added a new option to specify the width of a sparklineWidget column

redid samuel's decimal to hexa conversion function.

fixed copypasta bug.

forgot debug printf in there.

disable changing the default color of a segment.

rewrote the function to select annotations to make them clearer. No more functional magic!

changed project_id

added a utility function to test for both null and undefined.

more matching for segments types.

added automatic streamer detection.

added a test for backward-compatibility.

create a new contribution line in the json if it's not defined already.

DRYied the code.

search for ids in a case-insensitive way.

added a spinner displayed while submitting an annotation.

round the ms

update the jquery version requested from the cdn.

made the polemicwidget not show itself if it has no data to display.

WIP - create custom-sized segments in "normal" (non-cinecast) mode.

changed the background color of the wire pattern.

remove error message.

automatically position and show the sliceWidget under the current chapter.

show or hide the widget.

disable the cinecast modifications.

added integration test file for festival cinecast.

removed debug printf.

stricter equality check.

lots of refactoring for this widget, as well as changes to support the cinecast scenario.

added a method to get the current chapitre.

removed debug printf.

append a small space before keywords

handle the edge case where passed data is null.

removed useless display: directive.

slight fix

added an option to force the redraw of a list, even if the cached lists are the same (which is the case when we just added another annotation)

fixed creation bug.

made the listWidget redraw at every timeupdate event (added a small optimization though, to make sure that the widget isn't redrawn all the time).

WIP - trying to fix a seeking bug.

fixed stupid ms/s bug.

WIP - working on the autoupdate of the widget.

slight change

fixed config bug.

added support for widget redrawing.

made the file a little less project-specific.

correctly add an annotation.

style fix.