| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Timeline-local' into Timeline | Jonathan Duran | 2012-02-25 |
| |\ | |||
| | * | Timeline: Add grids to property tracks. First take on clearTimeline method ↵ | Jon Reid | 2012-02-24 |
| | | | | | | | | | on TimelinePanel class. | ||
| | * | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵ | Jon Reid | 2012-02-24 |
| | | | | | | | | | a layer, and fix serialization variable problem. | ||
| | * | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-24 |
| | |\ | |||
| | * \ | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 |
| | |\ \ | |||
| | * \ \ | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-24 |
| | |\ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'ninja-internal/master' into Timeline-local | Jon Reid | 2012-02-23 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | ||
| | * | | | | | Timeline: Add hottext fields to layers and serialize them throughout. | Jon Reid | 2012-02-23 |
| | | | | | | | |||
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-25 |
| |\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | |||
| | * | | | | Merge pull request #69 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-24 |
| | |\ \ \ \ | | | | | | | | | | | | | Removing tabs permissions | ||
| | | * | | | | Removing tabs permissions until we make a final decision on whether or not ↵ | John Mayhew | 2012-02-24 |
| | |/ / / / | | | | | | | | | | | | | | | | we will require it. | ||
| | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-24 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #68 from mqg734/ToolFixes | Valerio Virgillito | 2012-02-24 |
| | | |\ \ \ \ | | | |_|/ / | | |/| | | | Tool fixes - Adding back the InkBottle tool. Also Fixed some typos in 3d helper classes. | ||
| | | | * | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-24 |
| | | |/ / / | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * / / / | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | / | - added flag for timeline to identify new file flow | Jonathan Duran | 2012-02-24 |
| | |_|/ |/| | | | | | | | | | | | | | | | | | - added switchDocument event for timeline Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-24 |
| |\| | | |/ |/| | |||
| | * | Merge pull request #67 from ntfx47/PullRequest-Timeline | Valerio Virgillito | 2012-02-23 |
| | |\ | | | | | | | Timeline : Fix for the split and element model error | ||
| | | * | Timeline : Fix for the split and element model error | Kruti Shah | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | Timeline Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-23 |
| | |\ \ | |||
| | | * \ | Merge pull request #65 from mqg734/NiveshColor | Valerio Virgillito | 2012-02-23 |
| | | |\ \ | | | | | | | | | | | Fix to read back colors when re-opening files. | ||
| | | | * | | Fix to read back colors when re-opening files. | Nivesh Rajbhandari | 2012-02-23 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Fixing the selection tool properties icons. | Valerio Virgillito | 2012-02-23 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 |
| | |/ / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #64 from imix23ways/Timeline | Valerio Virgillito | 2012-02-23 |
| | |\ \ | | | | | | | | | Timeline | ||
| * | | | | add back layer selection | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 |
| | |/ / |/| | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 |
| | |/ |/| | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-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 Doc | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline Track Open doc | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-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 Duran | 2012-02-23 |
| | | | | | | | | | | | | | | | | | TimelineTrack component. Cherry pick commit from jreid/Timeline-jreid Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Unterminated lines | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Redo timeline resize code | Jonathan Duran | 2012-02-23 |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-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 Virgillito | 2012-02-23 |
| | | | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #60 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-22 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ | |/ |/| | |||
| * | | Merge pull request #63 from dhg637/new-tool-icons | Valerio Virgillito | 2012-02-22 |
| |\ \ | | | | | | | New tool icons | ||
| | * | | Removed Sass Cache | Armen Kesablyan | 2012-02-22 |
| | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||