| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Timeline: Bug Fix: Document switching was doubling position tracks. | Jon Reid | 2012-06-21 |
| | | |||
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-19 |
| |\ | |||
| | * | Fix position tracks collapser to use unique element | Jonathan Duran | 2012-06-19 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
| |/ | | | | manipulation! | ||
| * | Timeline: Enable splitting of keyframes with F6 interaction. | Jon Reid | 2012-06-18 |
| | | | | | Bug fix: Error on console if you press F6 with no layer selected. | ||
| * | Timeline: Bug fix: Document switching no longer causes multiple styles to be | Jon Reid | 2012-06-15 |
| | | | | | added. | ||
| * | Timeline: Bug fix: Correctly maintain expand/collapse state of layers and | Jon Reid | 2012-06-15 |
| | | | | | subproperties across document switching. | ||
| * | Timeline: Replace currentSelectedContainer with new model.domContainer. | Jon Reid | 2012-06-15 |
| | | |||
| * | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
| |\ | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | fix a typo | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Timeline: Fix document switching under Montage v.10 | Jon Reid | 2012-06-12 |
| | | | |||
| | * | removing the serializable from the timeline repetition and fixing the panels ↵ | Valerio Virgillito | 2012-06-12 |
| | | | | | | | | | | | | | currentDocument binding Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | | | | | | | | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | first iteration of adding serializable to ninja plus other changes to run ↵ | Valerio Virgillito | 2012-06-06 |
| | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Remove obsolete absolute/relative options from timeline config menu | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Hide timeline zoom slider temporarily | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | F6 support for keyframes | Jonathan Duran | 2012-06-15 |
| | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Timeline: fix serialization error. | Jon Reid | 2012-06-14 |
| | | | | |||
| * | | | Timeline: More work on new easing menu. | Jon Reid | 2012-06-13 |
| | | | | |||
| * | | | Timeline: New popup menu for easing choices. | Jon Reid | 2012-06-12 |
| | | | | |||
| * | | | Timeline: New feature: Only one easing menu can be open at a time. | Jon Reid | 2012-06-08 |
| | | | | |||
| * | | | Timeline: Merge branch 'pull-request' into timeline-local | Jon Reid | 2012-06-05 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| | * | | Timeline: Fix line endings, set to UNIX. | Jon Reid | 2012-06-05 |
| | | | | |||
| | * | | Timeline: Fixes to timeline to handle document switching & breadcrumb | Jon Reid | 2012-06-04 |
| | |/ | | | | | | | interactions under new DOM Architecture. | ||
| * | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-05 |
| |\ \ | |||
| | * | | Timeline: Better style selection and deselection. Automatic re-selection of | Jon Reid | 2012-06-01 |
| | | | | | | | | | | | | | previously selected style when parent layer is reselected. | ||
| | * | | 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 |
| | | | | |||