| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | * | | | | | | | | | | Replacing temp color chip pop | Jose Antonio Marquez | 2012-06-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the temporary color chip popup with a main popup used universally throughout the app. There are still outstanding issues to be addressed, this is just the initial set up before debugging issues. | |||
| * | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | clean up | Jonathan Duran | 2012-06-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section. | |||
| | * | | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 | |
| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | FIX layer selection bug | Jonathan Duran | 2012-06-28 | |
| | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * / | | | | | | | | | | Bug Fix : Hot text updates with keyframe selection | Kruti Shah | 2012-06-28 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | | | | | | | / | Timeline: bug fix IKNINJA-1843 | Jon Reid | 2012-06-27 | |
| | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||
| * | | | | | | | | | Merge pull request #347 from mqg734/ComponentShapeToolBug | Valerio Virgillito | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | |||
| | * | | | | | | | | Temporarily disable ElementMediator's addDelegate when adding components. | Nivesh Rajbhandari | 2012-06-27 | |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | | | Merge pull request #342 from imix23ways/Timeline-pullrequest | Valerio Virgillito | 2012-06-27 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Timeline Bugfixes | |||
| | * | | | | | | | Bug Fix : Hot Text change from the CSS panel | Kruti Shah | 2012-06-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| | |\ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | Timeline: Bug fix: Hintable should work better now. | Jon Reid | 2012-06-27 | |
| | | | | | | | | | | | ||||
| | | * | | | | | | | | Fix animation names breaking | Jonathan Duran | 2012-06-27 | |
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 | |
| | | |\| | | | | | | ||||
| | * | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||
| | * | | | | | | | | Bug Fix : PI changes in Position updates the hottest in timeline & Keyframes ↵ | Kruti Shah | 2012-06-27 | |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deselection help apply style property Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| | |\ \ \ \ \ \ \ | ||||
| | | * | | | | | | | FIx - hook up play button in timeline to live preview | Jonathan Duran | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Fix keyframe selection stickiness | Jonathan Duran | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | Timeline: Bug fix: Adding or splitting tweens on multiple layers at once | Jon Reid | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will no longer change the selection. | |||
| | | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 | |
| | | | |\ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes, | Jon Reid | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including splitting tweens. | |||
| | | * | | | | | | | | | Fix missing serialization in Layer.js | Jonathan Duran | 2012-06-26 | |
| | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | | |\| | | | | | | | ||||
| | | | * | | | | | | | Timeline: Bug fix: Indexing on styles when loading files. | Jon Reid | 2012-06-26 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-26 | |
| | | | |\ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | Timeline: Bug fix IKNINJA-1816 | Jon Reid | 2012-06-26 | |
| | | | | | | | | | | | | ||||
| | | * | | | | | | | | | Fix - deselect tweens when selecting a layer | Jonathan Duran | 2012-06-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-26 | |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | ||||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-27 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | ||||
| | * | | | | | | | | | | Bug Fix: Fix Animation for Position & Size Props | Kruti Shah | 2012-06-27 | |
| | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| | * | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-26 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||
| | * | | | | | | | | | ||||