| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUber | Jonathan Duran | 2012-03-06 | |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | Timeline: Storing Hashtable for element Mapping | Kruti Shah | 2012-03-06 | |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | Timeline:Storing HashTable for switching docs | Kruti Shah | 2012-03-06 | |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | Timeline: Fixing the layer switching | Kruti Shah | 2012-03-05 | |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | Timeline: Removing Events for Adding and Deleting Layer, Taking care of ↵ | Kruti Shah | 2012-03-05 | |
| | | | | | | | | | | | | | BreadCrumb Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 | |
| | | | ||||
| * | | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 | |
| |\ \ | ||||
| | * \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 | |
| | |\ \ | ||||
| | | * | | Timeline Fix for layer/element selection | Jonathan Duran | 2012-03-06 | |
| | | |/ | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | / | Timeline: Serialization of all Collapser components | Jon Reid | 2012-03-02 | |
| |/ / | ||||
| * / | Timeline: Fix TODOs for consolidating repetition objects. | Jon Reid | 2012-03-02 | |
| |/ | ||||
| * | Timeline bug fixes and cleanup | Jonathan Duran | 2012-03-01 | |
| | | | | | | | Deselect tweens on every selection change. Replace JS alerts with console logs. Cleanup obsolete models and references. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Fix for selection change event handler | Jonathan Duran | 2012-03-01 | |
| | | | | | | | event handler wasn't being executed because of incorrect handler function name Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 | |
| | | | | | Redefine collapser to use property binding instead of events. | |||
| * | Timeline: Merge. Set collapser heights. | Jon Reid | 2012-03-01 | |
| | | ||||
| * | Merge branch 'Timeline-main' into Timeline-newdoc | Jon Reid | 2012-03-01 | |
| |\ | ||||
| | * | Timeline: Changed the variables names to resolve issues.And removed the alert. | Kruti Shah | 2012-02-29 | |
| | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Timeline: Document switching and code restructuring. | Jon Reid | 2012-03-01 | |
| | | | ||||
| * | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc | Jon Reid | 2012-02-29 | |
| |\| | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| | * | Timeline: Fix Selection , Partially Fix adding element to an already ↵ | Kruti Shah | 2012-02-28 | |
| | | | | | | | | | | | | | animated track with one element Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | Timeline: document switching + new document. | Jon Reid | 2012-02-29 | |
| |/ | ||||
| * | Timeline : Deleting Layer deletes the element, Deleting Layer selects ↵ | Jonathan Duran | 2012-02-28 | |
| | | | | | | | | another layer Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Fix element selection on open doc | Jonathan Duran | 2012-02-28 | |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline: Basic document switching. | Jon Reid | 2012-02-28 | |
| | | ||||
| * | Timeline: Successfully unbind event listeners in tweens when clearing timeline. | Jon Reid | 2012-02-27 | |
| | | ||||
| * | Timeline: try to clean up bogus events manually. | Jon Reid | 2012-02-27 | |
| | | ||||
| * | Timeline: More work on clear timeline method. | Jon Reid | 2012-02-27 | |
| | | ||||
| * | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 | |
| |\ | ||||
| | * | Timeline : Reopening Doc has layer 1 default fix | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | Timeline: RetrieveStoredTweens calling fixed | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 | |
| | |\ | ||||
| | | * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | Timeline : Selection Fix | Jonathan Duran | 2012-02-27 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | Timeline: further work on clearTimeline method. | Jon Reid | 2012-02-27 | |
| |/ / | ||||
| * | | Timeline: Add grids to property tracks. First take on clearTimeline method ↵ | Jon Reid | 2012-02-24 | |
| | | | | | | | | | on TimelinePanel class. | |||
| * | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 | |
| |\| | ||||
| | * | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 | |
| | | | ||||
| * | | add back layer selection | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Move element selection to click handler | Jonathan Duran | 2012-02-23 | |
| |/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 | |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | New Doc | Jonathan Duran | 2012-02-23 | |
| | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-02-23 | |
| | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Unterminated lines | Jonathan Duran | 2012-02-23 | |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Redo timeline resize code | Jonathan Duran | 2012-02-23 | |
| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 | |
| | | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | Removing the timeline selection code. | Valerio Virgillito | 2012-02-20 | |
| | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
| |\ | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | |||