Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | 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 until we make a final decision on whether or not we... | John Mayhew | 2012-02-24 | |
| |/ / / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Marking inkbottle as the final tool in the set. | Nivesh Rajbhandari | 2012-02-24 | |
| | | * | | | | | | | | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functio... | Nivesh Rajbhandari | 2012-02-24 | |
| | | * | | | | | | | | | | | | | | | Javascript does not evaluate a return with its expression in a new line. The ... | Nivesh Rajbhandari | 2012-02-24 | |
| | | * | | | | | | | | | | | | | | | Removing duplicate get/setElementPlanes method. | Nivesh Rajbhandari | 2012-02-24 | |
| | |/ / / / / / / / / / / / / / / | ||||
| * / / / / / / / / / / / / / / / | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 | |
| |/ / / / / / / / / / / / / / / | ||||
* | | / / / / / / / / / / / / / | - added flag for timeline to identify new file flow | Jonathan Duran | 2012-02-24 | |
| |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | 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 | Kruti Shah | 2012-02-23 | |
| * | | | | | | | | | | | | | | 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. | Nivesh Rajbhandari | 2012-02-23 | |
| * | | | | | | | | | | | | | | Fixing the selection tool properties icons. | Valerio Virgillito | 2012-02-23 | |
| |/ / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | Fixing app mode check. | Valerio Virgillito | 2012-02-23 | |
| * | | | | | | | | | | | | | fixing the tools shortcuts - IKNINJA 1199 | Valerio Virgillito | 2012-02-23 | |
| |/ / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | Merge pull request #64 from imix23ways/Timeline | Valerio Virgillito | 2012-02-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | add back layer selection | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | | | Remove unneeded selection code | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | | | Move element selection to click handler | Jonathan Duran | 2012-02-23 | |
| |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | Remove selection calls from timelinepanel.js | Jonathan Duran | 2012-02-23 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||
* | | | | | | | | | | | Fix for tween repetition arrays getting overwritten on file open | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Timeline: Reopen Doc Restore TimeLine | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | New Doc | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Timeline Track Open doc | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Timeline:Open Doc in TimelinePanel.js | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Timeline: Create new PropertyTrack subcomponent, and use it in the TimelineTr... | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Unterminated lines | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Redo timeline resize code | Jonathan Duran | 2012-02-23 | |
* | | | | | | | | | | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 | |
|/ / / / / / / / / / | ||||
* | | | | | | | | | | Fixing the breadcrumb button - removing toolbutton class since it is not a to... | Valerio Virgillito | 2012-02-23 | |
* | | | | | | | | | | Merge pull request #60 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-02-23 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||
| * | | | | | | | | | Updating textfield to only use nj-skinned class and updating input-group to c... | Nivesh Rajbhandari | 2012-02-22 | |
| * | | | | | | | | | Adding back the local storage check in the cloudpopup. | Nivesh Rajbhandari | 2012-02-22 | |
| * | | | | | | | | | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 | |
| * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #63 from dhg637/new-tool-icons | Valerio Virgill |