aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | | | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Javascript does not evaluate a return with its expression in a new line. The ↵Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | | | Removing duplicate get/setElementPlanes method.Nivesh Rajbhandari2012-02-24
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / / / / / / / / / / / Adding some missing copyrightsValerio Virgillito2012-02-24
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Merge pull request #67 from ntfx47/PullRequest-TimelineValerio Virgillito2012-02-23
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Timeline : Fix for the split and element model error
| * | | | | | | | | | | Timeline : Fix for the split and element model errorKruti Shah2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-23
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #65 from mqg734/NiveshColorValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | Fix to read back colors when re-opening files.
| | * | | | | | | | | | Fix to read back colors when re-opening files.Nivesh Rajbhandari2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | | | Fixing the selection tool properties icons.Valerio Virgillito2012-02-23
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Fixing app mode check.Valerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | fixing the tools shortcuts - IKNINJA 1199Valerio Virgillito2012-02-23
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge pull request #64 from imix23ways/TimelineValerio Virgillito2012-02-23
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | Timeline
| * | | | | | | | Remove selection calls from timelinepanel.jsJonathan Duran2012-02-23
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Fix for tween repetition arrays getting overwritten on file openJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline: Reopen Doc Restore TimeLineJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | New DocJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline Track Open docJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline:Open Doc in TimelinePanel.jsJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the ↵Jonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Unterminated linesJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Redo timeline resize codeJonathan Duran2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Timeline Reset to clean Master branch. Code scrub.Jonathan Duran2012-02-23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | Fixing the breadcrumb button - removing toolbutton class since it is not a ↵Valerio Virgillito2012-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge pull request #60 from mqg734/WebGLMaterialsValerio Virgillito2012-02-23
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Integrating WebGL and canvas-2d drawing fixes. Fixed Materials Editor Popup to work with latest Montage framework. Also adding back WebGL materials.
| * | | | | | Updating textfield to only use nj-skinned class and updating input-group to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check for nj-skinned class instead of textfield class for styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Buttons in the rectangle properties in the to