aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-23
|\
| * Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-23
| |\
| | * Bugs fixed:hwc4872012-07-23
| * | Fix: Adding a check for element w/h/t/lJose Antonio Marquez2012-07-23
* | | 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 s...Eric Guzman2012-07-17
| | * | | | | 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
| | * | | | | 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
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Improve keyframe selection by moving playhead marker to lower z-indexJonathan Duran2012-07-19
| * | | | | | | | FIx 3D animation workflowJonathan Duran2012-07-19
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-19
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | The zoom slider position remembered between multi doc switchKruti Shah2012-07-18
| | * | | | | | 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
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | 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 WebGL...Nivesh Rajbhandari2012-07-20
| | * | | | | | | | IKNINJA-1780 - [Shape] Error when opening document that contains a shape with...Nivesh Rajbhandari2012-07-19
| | * | | | | | | | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.Nivesh Rajbhandari2012-07-19
| | * | | | | | | | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding pa...Nivesh Rajbhandari2012-07-19
| | * | | | | | | | Restrict materials popup to appear within our page.Nivesh Rajbhandari2012-07-19
| * | | | | | | | | Binding view: fixed mouse move event outside the hudValerio Virgillito2012-07-20
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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 SHA:819348eaf3ff6b4a8c38ecca7...Ananya Sen2012-07-20
| * | | | | | | | copy/paste from external apps - removed unnecessary selection change to fix P...Ananya Sen2012-07-19
* | | | | | | | | 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 Virgillito2012-07-19
| | |/ / / / / /
| * | | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| | * | | | | | Re-added Radial Blur and Raiders materialshwc4872012-07-19
| | |/ / / / /
| * / / / / / Squashed commit of the following:Nivesh Rajbhandari2012-07-19
| |/ / / / /