aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\
| * Merge branch 'minorFixes_7.1' of https://github.com/ericguzman/ninjaValerio Virgillito2012-07-23
| |\
| | * CSS Panel - Remove data attribute to remove style tags from document.Eric Guzman2012-07-20
| | |
| | * Merge branch 'refs/heads/fixes_7.1' into minorFixes_7.1Eric Guzman2012-07-20
| | |\
| | | * Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
| | | |\
| | | * | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | | |
| | | * | Style Sheets - Show dirty marker when editing media attributeEric Guzman2012-07-18
| | | | |
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja into fixes_7.1Eric Guzman2012-07-18
| | | |\ \
| | | * | | CSS Panel - Handle media attribute changesEric Guzman2012-07-17
| | | | | |
| | | * | | Styles Controller - Re-add dirty event. Add data- attribute to keep created ↵Eric Guzman2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | stylesheets.
| | * | | | CSS Panel - Fix updating when media changes, sheets are deleted.Eric Guzman2012-07-20
| | | |_|/ | | |/| |
* | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\| | | |
| * | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \
| | * | | | | The zoom slider resets.Commented some codeKruti Shah2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-20
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-19
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-20
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-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-indexJonathan Duran2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | FIx 3D animation workflowJonathan Duran2012-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 TimelineUberJonathan Duran2012-07-19
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-18
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'template-pi-breadcrumb' of https://github.com/mencio/ninjaValerio Virgillito2012-07-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Unifying the banner and animation template display of ninja-contentValerio Virgillito2012-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 DocumentJose Antonio Marquez2012-07-20
|\| | | | | | | |
| * | | | | | | | Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | If no material was defined, use Flat material when switching from 2d to ↵Nivesh Rajbhandari2012-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebGL shape. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding ↵Nivesh Rajbhandari2012-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 Rajbhandari2012-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the variable event to 'e' Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-20
|\| | | | | | | |
| * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-20
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | fixing logical error which was a side-effect of ↵Ananya Sen2012-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 Sen2012-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 DocumentJose Antonio Marquez2012-07-20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito201