| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-06 |
| |\ | |||
| | * | fixing the number fields to not have units. | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-04-04 |
| | |\ | |||
| | * | | completing the component simple pi | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | IKNINJA-1191 - Fixed the order of the components | Valerio Virgillito | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-03-28 |
| | |\ \ | |||
| | * | | | Cleanup of the components panel | Valerio Virgillito | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-05 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Merge pull request #149 from dhg637/BugFixes | Valerio Virgillito | 2012-04-04 |
| | |\ \ \ | | | | | | | | | | | Bug fixes | ||
| | | * \ \ | Merge branch 'refs/heads/master' into BugFixes | Armen Kesablyan | 2012-04-04 |
| | | |\ \ \ | |||
| | | * | | | | Resizing Bugs | Armen Kesablyan | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | Bug #1073: Panels interact with hottest drag drop | Armen Kesablyan | 2012-03-28 |
| | | | |_|/ | | |/| | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| | * | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 |
| | | | | | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | ||
| * | | | | | Should not select any layer on element delete | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Update timeline to work with new element removed event | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/tools/SelectionTool.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Changing layer name should put dirty flag on doc | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | define "that" var correctly | Jonathan Duran | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'timeline-k' of github.com:ntfx47/ninja-internal into TimelineUber | Jonathan Duran | 2012-04-04 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | Timeline: Saving layername | Kruti Shah | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | Timeline: Initial implementation of timeline zoom. | Jon Reid | 2012-04-03 |
| | | | | | | | |||
| | * | | | | | TImeline : Bug Fix 1429 & The zoom tweendata | Kruti Shah | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | FIX IKNINJA-1309 Timeline:Master Layer animation span is gone when another ↵ | Jonathan Duran | 2012-04-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new file is open Fix for master duration indicator not updating when switching files Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | Timeline: disable console logs in layer component. | Jon Reid | 2012-04-03 |
| | | | | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\| | | | | | | |||
| | * | | | | | | Timeline: Bug fix: IKNINJA-1431, "Adding a new element to the stage with one | Jon Reid | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer in focus whose name is empty, Ninja creates an empty name layer for the element." | ||
| | * | | | | | | Timeline: Autoscrolling when dragging a layer within a scrollable layer | Jon Reid | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list. | ||
| | * | | | | | | Timeline: Move drag-and-drop helper deletion to draw routine. Bug fix: | Jon Reid | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | better handling of drag-and-drop finish events and cleanup of helper. | ||
| | * | | | | | | Timeline: Link layerDragEnd and layerDrop events to better handle end of | Jon Reid | 2012-03-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag-and-drop events. | ||
| | * | | | | | | Timeline: Bug fixes. | Jon Reid | 2012-03-30 |
| | |/ / / / / | |||
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-03 |
| |\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||
| | * | / / | CSS Panel - Fix animation duration value updates from "infinite" to integer. | Eric Guzman | 2012-03-29 |
| | | |/ / | |/| | | |||
| * | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ \ \ \ | |||
| | * | | | | Timeline: Stability fixes for drag-and-drop and page switching. | Jon Reid | 2012-03-27 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||
| | * | | | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | |\| | | | | | | | | | | Presets - Adding presets controller | ||
| | | * | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| | | |\| | |||
| | | * | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | | | | | | | | | | | | | | | | | panel code | ||
| | * | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ | | |_|/ | |/| | | Resizers refactoring | ||
| | | * | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/master' into DataBinding | Armen Kesablyan | 2012-03-22 |
| | | |\| | |||
| | | * | | Updated Resizers for Panels and timeline | Armen Kesablyan | 2012-03-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| | |\ \ \ | | | | | | | | | | | Color Bug Fix | ||
| | | * | | | Fix: IKNINJA-1362 | Jose Antonio Marquez | 2012-03-26 |
| | | | |/ | | |/| | |||
| | * | | | Merge pull request #138 from joseeight/FileIO-Montage-Components | Valerio Virgillito | 2012-03-23 |
| | |\ \ \ | | | | | | | | | | | I/O Fixes | ||
| | | * \ \ | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||