| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\ | |||
| | * | Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninja | Valerio Virgillito | 2012-07-23 |
| | |\ | |||
| | | * | CSS Panel - Remove data attribute to remove style tags from document. | Eric Guzman | 2012-07-20 |
| | | | | |||
| | | * | Merge branch 'refs/heads/master' into fixes_7.1 | Eric Guzman | 2012-07-20 |
| | | |\ | |||
| | | * | | CSS Panel - Fix updating when media changes, sheets are deleted. | Eric Guzman | 2012-07-20 |
| | | | | | |||
| | | * | | Style Sheets - Show dirty marker when editing media attribute | Eric Guzman | 2012-07-18 |
| | | | | | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1 | Eric Guzman | 2012-07-18 |
| | | |\ \ | |||
| | | * | | | CSS Panel - Handle media attribute changes | Eric Guzman | 2012-07-17 |
| | | | | | | |||
| | | * | | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵ | Eric Guzman | 2012-07-17 |
| | | | | | | | | | | | | | | | | | | | | | stylesheets. | ||
| * | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\| | | | | |||
| | * | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-23 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ | |||
| | | * | | | | | The zoom slider resets.Commented some code | Kruti Shah | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-20 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Improve keyframe selection by moving playhead marker to lower z-index | Jonathan Duran | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | FIx 3D animation workflow | Jonathan Duran | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can now add 3D to any keyframe and all the tween will initialize their 3D identity matrices Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-19 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | The zoom slider position remembered between multi doc switch | Kruti Shah | 2012-07-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-23 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-22 |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | Unifying the banner and animation template display of ninja-content | Valerio Virgillito | 2012-07-20 |
| | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the banner and animation template the stage element now shows div in both the pi and breadcrumb. IKNINJA: 1776 Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | If no material was defined, use Flat material when switching from 2d to ↵ | Nivesh Rajbhandari | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL shape. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵ | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with gradient color or no color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action. | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding ↵ | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel causes error. Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | | | Restrict materials popup to appear within our page. | Nivesh Rajbhandari | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | | | Binding view: fixed mouse move event outside the hud | Valerio Virgillito | 2012-07-20 |
| | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the variable event to 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix | Ananya Sen | 2012-07-20 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | | fixing logical error which was a side-effect of ↵ | Ananya Sen | 2012-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SHA:819348eaf3ff6b4a8c38ecca7c18f6dacac7f03b recently Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | copy/paste from external apps - removed unnecessary selection change to fix ↵ | Ananya Sen | 2012-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PI redraw issue Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/controllers/clipboard-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-19 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outline | Valerio Virgillito | 2012-07-19 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-19 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | * | | | | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky. | hwc487 | 2012-07-19 |
| | | | | | | | | |||
| | | * | | | | | Re-added Radial Blur and Raiders materials | hwc487 | 2012-07-19 |
| | | |/ / / / | |||
| | * / / / / | Squashed commit of the following: | Nivesh Rajbhandari | 2012-07-19 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||