aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineJonathan Duran2012-02-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Timeline: Add grids to property tracks. First take on clearTimeline method ↵Jon Reid2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on TimelinePanel class.
| * | | | | | | | | | | | | | Timeline: Bug fixes: Delete corresponding track when a style is deleted from ↵Jon Reid2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a layer, and fix serialization variable problem.
| * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-localJon Reid2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-internal/master' into Timeline-localJon Reid2012-02-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * | | | | | | | | | | | | | | | Timeline: Add hottext fields to layers and serialize them throughout.Jon Reid2012-02-23
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineJonathan Duran2012-02-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #69 from mayhewinator/WorkingBranchmayhewinator2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | Removing tabs permissions
| | * | | | | | | | | | | | | | Removing tabs permissions until we make a final decision on whether or not ↵John Mayhew2012-02-24
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we will require it.
| * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #68 from mqg734/ToolFixesValerio Virgillito2012-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 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>
* | | / / / / / / / / / / - added flag for timeline to identify new file flowJonathan Duran2012-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 TimelineJonathan Duran2012-02-24
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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 Rajbhandari