aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Changed height of css panelArmen Kesablyan2012-02-14
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-14
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-14
| |\
| | * Merge pull request #39 from mencio/montage-overridesValerio Virgillito2012-02-13
| | |\ | | | | | | | | Adding a montage override sass file. Overriding the default css for montage popups.
| | | * Adding a montage override sass file. Overriding the default css for montage ↵Valerio Virgillito2012-02-13
| | |/ | | | | | | | | | | | | | | | popups. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge pull request #38 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-13
| | |\ | | | | | | | | Styles controller updates
| | | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-13
| | | |\ | | | |/ | | |/| | | | | | | | | Conflicts: js/controllers/styles-controller.js
| | * | Merge pull request #37 from mencio/stage-colorValerio Virgillito2012-02-13
| | |\ \ | | | | | | | | | | Stage color: Adding the stage background color chip to the stage PI
| | | * \ Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #36 from mayhewinator/WorkingBranchValerio Virgillito2012-02-13
| | |\ \ \ | | | | | | | | | | | | Final Splash Screen Art
| | | * \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-13
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | WorkingBranch
| | | * | | | implemented finalized splash screenJohn Mayhew2012-02-13
| | | | | | |
| | * | | | | Merge pull request #34 from ericguzman/TreeComponentsValerio Virgillito2012-02-13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Tree components - updating the ninja branch/leaf
| | | * | | | | Ninja leaf - remove console lotEric Guzman2012-02-13
| | | | | | | |
| | | * | | | | Merge branch 'refs/heads/master' into TreeComponentsEric Guzman2012-02-13
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Tree Components - Change the way delegate methods are calledEric Guzman2012-02-13
| | | | | | | |
| | | | | | * | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Bug FixesJose Antonio Marquez2012-02-13
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
| | | | | * | Cleaning up the stage background color chip.Valerio Virgillito2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-02-12
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | | | | | | | stage-color
| | | | | * | initial color chip for the stageValerio Virgillito2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | * Styles Controller - Separate css animation rule gettersEric Guzman2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To add document- and sheet-specific getters.
| | | | | | * Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-08
| | | | | | |\
| | | | | | * | Styles Controller - added methods to get keyframe animation rulesEric Guzman2012-02-08
| | | | | | | |
* | | | | | | | appended function : toViewportCoordinates in stageArmen Kesablyan2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/master' into text-toolArmen Kesablyan2012-02-13
|\| | | | | | |
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | Merge pull request #32 from mayhewinator/WorkingBranchmayhewinator2012-02-10
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | Updates for splash screen, menu items and implemented some of the new help menu items
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-10
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | WorkingBranch
| | * | | | | | Merge pull request #31 from mqg734/WebGLFixesValerio Virgillito2012-02-10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merging WebGL fixes
| | | * \ \ \ \ \ Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-02-10
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Support export/import of GLLine data.Nivesh Rajbhandari2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | Removing some console logs. I kept in the ones that signify error cases.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | Fixed switching between webGL and canvas 2d modes.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | Updated linear and radial gradient materials import/export routines.Nivesh Rajbhandari2012-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | | | Merging changes for rectangle drawing.Nivesh Rajbhandari2012-02-09
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | * | | | | | Changed the rendering for canvas 2D rectangle.hwc4872012-02-08
| | | | | | | | | |
| | | | * | | | | | Reversed the orientation of one of the triangles for WebGL rendering.hwc4872012-02-08
| | | | | | | | | |
| | | | * | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-08
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/RDGE/Materials/FlatMaterial.js
| | | | * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-02-08
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working
| | | | * | | | | | | | Removed unused rdge files from the compiler.hwc4872012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | switched the preloader to use the compiled version of rdge Updated the rdge binary.
| | | | * | | | | | | | Fixed context switching problems in rdgehwc4872012-02-08
| | | | | | | | | | | |
| | | | * | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into workinghwc4872012-02-07
| | | | |\ \ \ \ \ \ \ \ | | | | | | | |