aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\
| * Timeline: Bug fix: Adding or splitting tweens on multiple layers at onceJon Reid2012-06-26
| | | | | | | | will no longer change the selection.
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| |\
| * | Timeline: Bug fix: Keyboard shortcut now works for adding keyframes,Jon Reid2012-06-26
| | | | | | | | | | | | including splitting tweens.
* | | Fix missing serialization in Layer.jsJonathan Duran2012-06-26
| |/ |/| | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-26
|\|
| * Timeline: Bug fix: Indexing on styles when loading files.Jon Reid2012-06-26
| |
| * Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-26
| |\
| * | Timeline: Bug fix IKNINJA-1816Jon Reid2012-06-26
| | |
* | | Fix - deselect tweens when selecting a layerJonathan Duran2012-06-26
| | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-26
|\ \ \
| * \ \ Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ \ \ | | | | | | | | | | Binding View - Binding Tool & Binding Panel
| | * | | Binding View - Removed DebuggerArmen Kesablyan2012-06-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Binding View - Objects Replace existing source Object if it existsArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Can bind Multiple instanceArmen Kesablyan2012-06-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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 Kesablyan2012-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 BindingsArmen Kesablyan2012-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 OutArmen Kesablyan2012-06-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Binding Panel - Fixed Panel ButtonArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | BindingView :Montage UpdatesArmen Kesablyan2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ \ \ \ Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\ \ \ \ \ \
| | * | | | | | | Objects Tray - Use label instead of identifier for object nameEric Guzman2012-06-20
| | | | | | | | |
| | * | | | | | | Objects Tray - Filter list of components for those without visual representationEric Guzman2012-06-20
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-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 Guzman2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaned up some logs.
| | * | | | | | | | Edit View - Minor cleanupEric Guzman2012-06-18
| | | | | | | | | |
| | * | | | | | | | Binding panel - Minor change on add button handlerEric Guzman2012-06-18
| | | | | | | | | |
| | * | | | | | | | Edit Binding View - Handle no object for iconEric Guzman2012-06-18
| | | | | | | | | |
| | * | | | | | | | Binding - Show tray when there are objects. Edit binding view css update.Eric Guzman2012-06-18
| | | | | | | | | |
| | * | | | | | | | Objects Panel - removed for nowEric Guzman2012-06-15
| | | | | | | | | |
| | * | | | | | | | Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
| | | | | | | | | |
| | * | | | | | | | Edit Binding - Binding improvements to show icon and save formEric Guzman2012-06-13
| | | | | | | | | |
| | * | | | | | | | Objects Panel - Fix CSS to simplify showing object icons in other panelsEric Guzman2012-06-13
| | | | | | | | | |
| | * | | | | | | | Binding Panel - Dock the edit view when transition ends so horizontal ↵Eric Guzman2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resizing works
| | * | | | | | | | Edit Binding - Update LayoutEric Guzman2012-06-13
| | | | | | | | | |
| | * | | | | | | | Binding Panel - set up new edit view layoutEric Guzman2012-06-12
| | | | | | | | | |
| | * | | | | | | | Components - Add object instance to model's objects arrayEric Guzman2012-06-12
| | | | | | | | | |
| | * | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | | | | Objects Panel - CSS and serialization updateEric Guzman2012-06-11
| | | | | | | | | | | |
| | * | | | | | | | | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
| | |/ / / / /