| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | | * | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | ||||
| | | | * | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ \ | ||||
| | | | * \ \ \ \ | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ \ \ | ||||
| | | | | * | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | |_|/ / | | | | |/| | | | ||||
| | | | * / | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 | |
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | | | | | Fix a bug in span splitting interaction and remove console logs | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | allow splitting existing spans with new keyframe | Jonathan Duran | 2012-05-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Timeline: Bug fix: tweens now hide when their container collapses. | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Some sub prop updates | Jonathan Duran | 2012-05-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | sub property additions | Jonathan Duran | 2012-05-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Update timeline CSS to allow longer layer labels by default | Jonathan Duran | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Change sub property track arrays | Jonathan Duran | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | more sub prop additions | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-04 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | Timeline: True drag-and-drop of keyframes | Jon Reid | 2012-05-04 | |
| | | | | | | | | ||||
| | | * | | | | | Timeline: Restore event handler for selectionChange. | Jon Reid | 2012-05-04 | |
| | | | | | | | | ||||
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-05-04 | |
| | | |\ \ \ \ \ | ||||
| | | | * | | | | | Timeline: More fixes to selection changing and document switching. | Jon Reid | 2012-05-04 | |
| | | | | |_|/ / | | | |/| | | | ||||
| | | * | | | | | Timeline: More work on tween drag-and-drop | Jon Reid | 2012-05-03 | |
| | | | | | | | | ||||
| | | * | | | | | Timeline: Bug fix: Master Duration not updating when all documents are | Jon Reid | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closed. | |||
| | | * | | | | | Timeline: Initial keyframe drag-and-drop interaction. | Jon Reid | 2012-05-01 | |
| | | | | | | | | ||||
| | | * | | | | | Timeline: Expand/collapse state of layers now mantained across document | Jon Reid | 2012-05-01 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switching. | |||
| | * | | | | | | property track additions to serialization data object | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | Fix subproperty keyframe selection | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | update data bindings for subproperty tracks | Jonathan Duran | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | apply old stash to new branch | Jonathan Duran | 2012-05-03 | |
| | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial work and stubs for sub property support. serialization for property track components and classes Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | submitting project : Code Editor Improvements [Phase 1] | |||
| | | * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 | |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||
| | | * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 | |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||
| | | * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | | * \ \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-23 | |
| | | |\ \ \ \ \ | ||||
| | | * | | | | | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | | | | | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | Timeline uber | |||
| | | * | | | | | Timeline: bug fix: disable bread crumb setlevel. | Jon Reid | 2012-04-30 | |
| | | | | | | | | ||||
| | | * | | | | | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 | |
| | | | | | | | | ||||
| | | * | | | | | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 | |
| | | | |_|_|/ | | |/| | | | ||||
| | * / | | | | Dom Manipulation | Kruti Shah | 2012-05-03 | |
| | |/ / / / | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
| | |\ \ \ \ | ||||
| | | * \ \ \ | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | |||
| | | | * \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | | | |\ \ \ \ | ||||
| | | | * \ \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 | |
| | | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | ||||
| | | | * | | | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵ | Valerio Virgillito | 2012-04-26 | |
| | | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | ||||