| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | 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 |
| |\ | |||
| | * | 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 |
| | | | | | | |||
| | * | | | | 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 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | | Merge pull request #323 from dhg637/binding | Valerio Virgillito | 2012-06-26 |
| | |\ \ \ \ | | | | | | | | | | | | | Binding View - Binding Tool & Binding Panel | ||
| | | * | | | | 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> | ||
| | | * | | | | | 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> | ||
| | | * | | | | | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-21 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding View - Minor Fixes to remove warnings | Armen Kesablyan | 2012-06-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Binding Panel - Fixed Panel Button | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | BindingView :Montage Updates | Armen Kesablyan | 2012-06-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * \ \ \ \ \ \ | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Objects Tray - Use label instead of identifier for object name | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Objects Tray - Filter list of components for those without visual representation | Eric Guzman | 2012-06-20 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-19 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | | | | | | | | | Edit Binding View - Improve how form is populated, cleared, and saved. | Eric Guzman | 2012-06-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up some logs. | ||
| | | * | | | | | | | | | Edit View - Minor cleanup | Eric Guzman | 2012-06-18 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Binding panel - Minor change on add button handler | Eric Guzman | 2012-06-18 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Edit Binding View - Handle no object for icon | Eric Guzman | 2012-06-18 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Binding - Show tray when there are objects. Edit binding view css update. | Eric Guzman | 2012-06-18 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Objects Panel - removed for now | Eric Guzman | 2012-06-15 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Objects Tray - Add objects tray to binding view | Eric Guzman | 2012-06-15 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Edit Binding - Binding improvements to show icon and save form | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Objects Panel - Fix CSS to simplify showing object icons in other panels | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Binding Panel - Dock the edit view when transition ends so horizontal ↵ | Eric Guzman | 2012-06-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||