| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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> | ||
| | * | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| | |\ | | | | | | | Presets Panel - Change Tab labels, Add Un-3d preset | ||
| | | * | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | | | | |||
| | | * | Merge branch 'refs/heads/master' into AddAnimationsLibrary | Eric Guzman | 2012-03-17 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: js/panels/presets/default-transition-presets.js | ||
| | | * | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| | | | | | |||
| | * | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | | |/ | |/| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge pull request #124 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-16 |
| | |\| | | | | | | | Presets Panel - Adding Animations Tab | ||
| | | * | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |
| | | | | |||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-16 |
| | |\ \ | |||
| | | * \ | Merge pull request #121 from dhg637/Something | Valerio Virgillito | 2012-03-16 |
| | | |\ \ | | | | | | | | | | | Presets Panel: Added Scale Up and Down to transitions list. According to | ||
| | | | * | | Presets Panel: Added Scale Up and Down to transitions list. According to eric G. | Armen Kesablyan | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | | fixing the components drag and drop. | Valerio Virgillito | 2012-03-16 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge pull request #118 from mencio/pi-fixes | Valerio Virgillito | 2012-03-15 |
| | |\ \ \ | | | | | | | | | | | Fixed issues with Properties panel, focus and grid redraw | ||
| | | * | | | Merge branch 'refs/heads/master' into pi-fixes | Valerio Virgillito | 2012-03-15 |
| | | |\| | | |||
| | | * | | | Fixing the splitter resize canvas bug by getting the size when a document is ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opened. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | adding a focus manager to handle panel bugs where blur was not getting ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Fix layer order and selection on reopen | Jonathan Duran | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layer order should be in the same order as created. Nothing should be selected with opening a doc. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOM | Jonathan Duran | 2012-03-16 |
| |\ \ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'Timeline-local' into Timeline-local-2 | Jon Reid | 2012-03-16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-16 |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | ||
| | | * | | | | | Timeline: Hook up data binding for changes on subproperties. | Jon Reid | 2012-03-16 |
| | | | | | | | | |||
| | | * | | | | | Timeline: remove comment. | Jon Reid | 2012-03-15 |
| | | | | | | | | |||
| | | * | | | | | Timeline: Remove selection timer on add new layer method. | Jon Reid | 2012-03-15 |
| | | | | | | | | |||
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local | Jon Reid | 2012-03-15 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | Timeline: Fix for layer selection problems on file open and switch. | Jon Reid | 2012-03-15 |
| | | | | | | | | | |||
| * | | | | | | | | Consolidate conversion functions | Jonathan Duran | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | | Cleanup | Jonathan Duran | 2012-03-16 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | Bug fix and cleanup | Jonathan Duran | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up unneeded code for one element per layer support and fixing some bugs with selection and layer sync. Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | Fix layer select on selection change | Jonathan Duran | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | | | Start enforcing one element per layer | Jonathan Duran | 2012-03-16 |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||