aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-08
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | removed unnecessary functionAnanya Sen2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | | | copy/paste POCAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | | | | Merge pull request #321 from imix23ways/Timeline-merge-candidateValerio Virgillito2012-06-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX Timeline - Can't insert keyframes to a css style layer
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Timeline-local-kruti' into Timeline-merge-candidateJonathan Duran2012-06-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Sub Property ADding KEyframe fixedKruti Shah2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | | | | | | | | Fixing reference issue for toolbar fill containerJose Antonio Marquez2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wrapper container was not being referenced, caused some toggling visibility issues.
* | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | remove bad fileJonathan Duran2012-06-20
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Timeline: Bug fix: Keyframe animation now works with 3D elements.Jon Reid2012-06-20
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into timeline-localJon Reid2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | remove old methodJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | | | | | | remove unneeded filesJonathan Duran2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidateJonathan Duran2012-06-20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | / / / / / / / / / / / | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | Removed some codeKruti Shah2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | | | | | | | | | | | remove obsolete functionsJonathan Duran2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | * | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manipulation!
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-19
| |\ \