| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 | ||
| | | * | | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically. | ||
| | * | | | | | Presets - fixed preset group name ("2D") | Eric Guzman | 2012-03-23 |
| | | |/ / / | |/| | | | |||
| | * | | | | Presets Panel - Add slide/fade out animation | Eric Guzman | 2012-03-23 |
| | | | | | | |||
| | * | | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ | | | | | | | | | | | | | | | | montage-integration | ||
| | | * | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | montage-integration | ||
| | | * | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| | |\ \ \ \ | |||
| | | * | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵ | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | montage-integration | ||
| | | * | | | | Maps - Apply default width and height styles to components if specified. ↵ | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
| | |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||
| | * | | | | Youtube video is droppable | François Frisch | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Integrating picasa carousel and youtube channel | François Frisch | 2012-03-17 |
| | | | | | | |||
| | * | | | | adding element creation for the map and feedreader components. | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Adding components to PI | François Frisch | 2012-03-17 |
| | | |_|/ | |/| | | |||
| * | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵ | Jonathan Duran | 2012-03-27 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | Timeline : Zoom Slider Styling | Kruti Shah | 2012-03-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | Timeline : Breadcrumb Fix | Kruti Shah | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | Timeline : Adding Zoom Slider | Kruti Shah | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | Timeline: Change dragIcon to be a data-uri. | Jon Reid | 2012-03-26 |
| | | | | | | |||
| * | | | | | Timeline: Drag and Drop of layers. | Jon Reid | 2012-03-26 |
| | | | | | | |||
| * | | | | | Remove console logs | Jonathan Duran | 2012-03-26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Fix bug with track properties getting over written | Jonathan Duran | 2012-03-26 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-23 |
| |\ \ \ \ | |||
| | * | | | | Timeline: First integration of drag and drop of layers. | Jon Reid | 2012-03-21 |
| | | | | | | |||
| | * | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵ | Jon Reid | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | console.log calls in hintable component. | ||
| | * | | | | Fix: Change click handler to mousedown for better responsiveness in layer ↵ | Jon Reid | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | selection UI. | ||
| | * | | | | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| | | | | | | |||
| | * | | | | Timeline: Re-enable adding/removing styles to layers. New methods in ↵ | Jon Reid | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | TimelinePanel for creating new styles on document load. | ||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-23 |
| |\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||
| | * | | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||