| Commit message (Expand) | Author | Age |
* | 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 conso... | Jon Reid | 2012-03-21 |
| * | Fix: Change click handler to mousedown for better responsiveness in layer sel... | Jon Reid | 2012-03-21 |
| * | Timeline: fix layer and style select problems. | Jon Reid | 2012-03-20 |
| * | Timeline: Re-enable adding/removing styles to layers. New methods in Timeline... | Jon Reid | 2012-03-19 |
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-23 |
|\ \
| |/
|/| |
|
| * | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
| |\ |
|
| | * | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ... | Ananya Sen | 2012-03-16 |
| * | | Merge pull request #129 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-03-20 |
| |\ \ |
|
| | * | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Support button control in Properties Panel and use them for edit fill and str... | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Fixing error in drawUtils when closing document - should set _eltArray and _p... | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 |
| | * | | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| |/ / |
|
| * | | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| |\ \ |
|
| | * | | 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 |
| | |\| |
|
| | * | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| * | | | Merge pull request #128 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-03-19 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| |/ / |
|
| * | | Merge pull request #124 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-16 |
| |\| |
|
| | * | Presets Panel - Adding Animations Tab | Eric Guzman | 2012-03-16 |
| * | | Squashed commit of SnapManagerFixes | Valerio Virgillito | 2012-03-16 |
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-16 |
| |\ \ |
|
| | * \ | Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-16 |
| | |\ \ |
|
| | | * | | IKNINJA-1305 : fixed the check for stopVideos() method's existence | Ananya Sen | 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 eric G. | Armen Kesablyan | 2012-03-15 |
| * | | | | fixing the components drag and drop. | Valerio Virgillito | 2012-03-16 |
| |/ / / |
|
| * | | | fixing the drag and drop images to the pasteboard | Valerio Virgillito | 2012-03-16 |
| * | | | Temp fix applied to all elements | Jose Antonio Marquez | 2012-03-15 |
| * | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-15 |
| | |\ \ \ |
|
| | | * \ \ | Merge pull request #118 from mencio/pi-fixes | Valerio Virgillito | 2012-03-15 |
| | | |\ \ \ |
|
| | | | * \ \ | 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 |
| | | | * | | | | adding a focus manager to handle panel bugs where blur was not getting called... | Valerio Virgillito | 2012-03-14 |
| | | | * | | | | Removing the name attribute from the PI. Fixing the ID and Class attribute fr... | Valerio Virgillito | 2012-03-14 |
| | | * | | | | | Merge pull request #120 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-15 |
| | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | | |
|
| * | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\| | | | | | |
|
| | * | | | | | | Temp fix for element dimensions (SVG) | Jose Antonio Marquez | 2012-03-15 |
| | * | | | | | | Fixing offset bug for drag-and-drop | Jose Antonio Marquez | 2012-03-15 |
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-15 |
| | |\| | | | | |
|
| * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | Merge branch 'refs/heads/FileIO-Integration' into FileIO-Build-Candidate | Jose Antonio Marquez | 2012-03-15 |
| |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | * | | | | | | Merge pull request #34 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-15 |
| | |\ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | | * | | | | | Corrections for Uber shader IO | hwc487 | 2012-03-14 |