| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 |
| |\ | |||
| | * | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 |
| | | | |||
| * | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 |
| |/ | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | Timeline: bug fix: command-click now works for multi selecting layers on ↵ | Jon Reid | 2012-06-25 |
| | | | | | Macs. Also disabled control-click on macs. | ||
| * | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-25 |
| |\ | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Resolution: Use both. | ||
| | * | Timeline fix - remove unneeded binding | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 |
| | | | | | | | | | | | | | F5 now deletes the selected keyframe Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-20 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * \ | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-19 |
| | |\ \ | |||
| | * | | | LockedElements - Layers | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | Lock ELements | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | Locked Elements. Layer Controls | Kruti Shah | 2012-06-19 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | Timeline: Breadcrumb hash in currentDocument will now update as changes | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | are made to the DOM. | ||
| * | | | | Timeline: Bug fix: When creating a new file, Timeline was disabled. | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | (Injection from fix of IKNINJA-1783) | ||
| * | | | | Timeline: Bug fix IKNINJA-1791 Double-clicking to go in a child level and | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | coming back up to Body will collapse its layer and wipe out all the sub property keyframes. | ||
| * | | | | Timeline: Bug fix IKNINJA-1755 Can't insert keyframes in a CSS style | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | property of an object on top layer | ||
| * | | | | Timeline: Bug fix IKNINJA-1783, Timeline panel is disabled when CSS file is | Jon Reid | 2012-06-21 |
| | | | | | | | | | | | | | | | | | open in another tab. | ||
| * | | | | 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> | ||
| * | | | 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 | ||