| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | Timeline: Bug fixes for deleting styles and their associated tracks | Jon Reid | 2012-05-31 | |
| | | | | | | | | | | | | | correctly. | |||
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 | |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | fixing the timeline current document bindings | Valerio Virgillito | 2012-05-30 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | document bindings phase 1 | Valerio Virgillito | 2012-05-29 | |
| | | | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-24 | |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js | |||
| | | * | adding document views checks for the timeline and breadcrumb | Valerio Virgillito | 2012-05-23 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | Timeline triggerBinding needs to be set to false in the track data. | Nivesh Rajbhandari | 2012-05-23 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | * | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 | |
| | |/ | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view. | |||
| | * | Timeline should not select an element when a layer is selected by code. | Valerio Virgillito | 2012-05-16 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | fixing the timeline selecting when creating a new layer | Valerio Virgillito | 2012-05-11 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Timeline: bug fix: better selection/deselection of styles within layers. | Jon Reid | 2012-05-25 | |
| | | | ||||
| * | | Timeline: Easing selection per keyframe. | Jon Reid | 2012-05-23 | |
| | | | ||||
| * | | Timeline: Code cleanup | Jon Reid | 2012-05-18 | |
| | | | ||||
| * | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 | |
| | | | ||||
| * | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 | |
| | | | | | | | | | | | multiselect. Fix Property Panel so changing an ID there will actually change an ID on the element (broken by switch from id to data-montage-id change). | |||
| * | | Timeline: More bug fixes and code cleanup for multiselect. | Jon Reid | 2012-05-17 | |
| | | | ||||
| * | | Timeline: Bug fixes for multiselect | Jon Reid | 2012-05-17 | |
| | | | ||||
| * | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 | |
| | | | | | | | | | drag and drop. | |||
| * | | Timeline: Multiselect from the layer panel. | Jon Reid | 2012-05-15 | |
| | | | ||||
| * | | Merge branch 'timeline-local' into timeline-multiselect | Jon Reid | 2012-05-15 | |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers) | |||
| | * | | Timeline: Code cleanup. Improve efficiency for track scrolling. | Jon Reid | 2012-05-15 | |
| | | | | ||||
| | * | | Squashed commit of the following: | Jonathan Duran | 2012-05-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit b23502b8ed6856981d09577d4cf24283e5db8afa Author: Kruti Shah <kruti.shah@motorola.com> Date: Mon May 14 10:48:16 2012 -0700 Removed Debugger Signed-off-by: Kruti Shah <kruti.shah@motorola.com> commit c0b531a074e9cf9a964da0cda496bba8d7453ec1 Author: Kruti Shah <kruti.shah@motorola.com> Date: Fri May 11 13:55:18 2012 -0700 Changing Doc Layer Name Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | Merge branch 'refs/heads/TimelineUber' into TimelineProps | Jonathan Duran | 2012-05-11 | |
| | |\ \ | ||||
| | | * | | Timeline: Bug fixes for keyframe drag and drop. | Jon Reid | 2012-05-09 | |
| | | | | | ||||
| | | * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-09 | |
| | | |\ \ | ||||
| | | | * | | Timeline: Automatic scrolling during dragging of keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | | ||||
| | | | * | | Timeline: Bug fix: Account for horizontal scroll when dragging keyframes. | Jon Reid | 2012-05-08 | |
| | | | | | | ||||
| | | | * | | Timeline: Update drag and drop handlers to be unique for drag and drop type. | Jon Reid | 2012-05-08 | |
| | | | | | | ||||
| | | | * | | Timeline: Move keyframe dragover and drop listeners to TimelinePanel for | Jon Reid | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | | | | | interaction improvements. | |||
| | | * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-09 | |
| | | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | | * | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@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> | |||
| | * | | 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 | |
| | | |/ | ||||
| | | * | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 | |
| | | |\ | | | | | | | | | Timeline uber | |||
| | | * | | Dom Manipulation | Kruti Shah | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | 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: 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 | |
| | |/ | ||||
| | * | 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 | |
| | |\ | ||||
| | | * | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 | |
| | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully | |||
| * | | | Timeline: Multiselect. | Jon Reid | 2012-04-27 | |
| |/ / | ||||
| * | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 | |
| | | | ||||
| * | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 | |
| | | | ||||