| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-27 |
| |\ | |||
| | * | Merge pull request #339 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-27 |
| | |\ | | | | | | | fixed code hinting and autocompletion bug | ||
| | | * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-27 |
| | | |\ | | |/ | |/| | |||
| | | * | initialize auto code hinting flag with checkbox value, on switching between ↵ | Ananya Sen | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | turning off autocompletion since it is interfering typing | Ananya Sen | 2012-06-26 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-26 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | refactored to move bindings to template | Ananya Sen | 2012-06-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-26 |
| | | |\ \ | |||
| | | * | | | fixed code hinting and autocompletion bug | Ananya Sen | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Fix animation names breaking | Jonathan Duran | 2012-06-27 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Fix element getting stuck with live preview mode | 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 pull request #341 from ericguzman/Chrome20_CSS_Workaround | Valerio Virgillito | 2012-06-27 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Styles Controller - Chrome 20 Fix | ||
| | | * | | | Styles Controller - Remove debugger | Eric Guzman | 2012-06-26 |
| | | | | | | |||
| | | * | | | Styles Controller - Chrome 20 Fix | Eric Guzman | 2012-06-26 |
| | |/ / / | |||
| * | | | | 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 |
| | | | | | | | | |||
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 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/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-06-26 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | | Merge pull request #340 from mencio/panel-cleanup-scroll | Valerio Virgillito | 2012-06-26 |
| | |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | Panel cleanup scroll | ||
| | | * | | | | | | Merge branch 'refs/heads/master' into panel-cleanup-scroll | Valerio Virgillito | 2012-06-26 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||
| | | * | | | | | | removing un-necessary panel styles and possibly fix IKNINJA-1626 | Valerio Virgillito | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| | |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | Binding View - Binding Tool & Binding Panel | ||
| | | * | | | | | | Reverting binding.js | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding View - Removed Debugger | Armen Kesablyan | 2012-06-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding View - Objects Replace existing source Object if it exists | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Can bind Multiple instance | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-25 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Armen Kesablyan | 2012-06-25 |
| | | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | | Binding Panel - Changing direction in edit mode doesn't apply dirty to the ↵ | Armen Kesablyan | 2012-06-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edit form Check/Uncheck the Binding direction (Oneway) check box in the binding setting doesn't enable "SAVE" button. Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | Binding Panel - Can Now Edit and Delete Bindings | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug Description: Binding Arguments that are passed in the edit form were being set to null after it was set. Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | Binding View: Fixed If Selected Div Erroring Out | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | Removed Console Logs | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | Text Tool Fix - Can Not Switch Document when Text Tool Initialized | Armen Kesablyan | 2012-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |||