aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-16
|\
| * Merge pull request #15 from ericguzman/bindingArmen Kesablyan2012-06-15
| |\
* | | Objects Tray - Moved to stage object from binding viewEric Guzman2012-06-15
| |/ |/|
* | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-15
|\|
| * Put Objects in front of HudsArmen Kesablyan2012-06-15
| * Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
| |\
| * \ Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
| |\ \
| * | | Binding Hud: Calling Option Selection to viewArmen Kesablyan2012-06-15
* | | | Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| |_|/ |/| |
* | | Merge pull request #14 from ericguzman/bindingArmen Kesablyan2012-06-15
|\ \ \ | |_|/ |/| |
| * | Objects Panel - removed for nowEric Guzman2012-06-15
| * | Objects Tray - Add objects tray to binding viewEric Guzman2012-06-15
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-14
| |\|
* | | Merge pull request #13 from ericguzman/bindingArmen Kesablyan2012-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
| * Objects Controller - Fix call to get current object bindings after add/removi...Eric Guzman2012-06-13
* | Binding-Huds draw to componentArmen Kesablyan2012-06-14
|/
* Merge pull request #12 from ericguzman/bindingArmen Kesablyan2012-06-13
|\
| * Binding Panel - Dock the edit view when transition ends so horizontal resizin...Eric Guzman2012-06-13
| * Objects Controller - Update current object bindings when adding/removing bind...Eric Guzman2012-06-13
| * Edit Binding - Update LayoutEric Guzman2012-06-13
| * Binding Panel - set up new edit view layoutEric Guzman2012-06-12
| * Binding View - Use same icon component as objects panelEric Guzman2012-06-12
| * Components - Add object instance to model's objects arrayEric Guzman2012-06-12
| * Objects Controller - Add concept of categoriesEric Guzman2012-06-12
| * Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\
| * | Objects Panel - CSS and serialization updateEric Guzman2012-06-11
| * | Merge branch 'binding' of github.com:dhg637/ninja-internal into bindingEric Guzman2012-06-11
| |\ \
| * | | Objects Panel - Add component icon and icons by typeEric Guzman2012-06-11
* | | | Binding-View: Translate hudsArmen Kesablyan2012-06-13
| |_|/ |/| |
* | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| |\ \
| | * \ Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| | |\ \
| | | * \ Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | | |\ \
| | | * | | Removing iframeContainer scroll styles since the scrollbars are not drawn in ...Nivesh Rajbhandari2012-06-08
| | | * | | Overriding scrollbar styles on the template so the scroll track is not white....Nivesh Rajbhandari2012-06-08
| | * | | | Merge pull request #287 from joseeight/FileIOValerio Virgillito2012-06-11
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | |/ / /
| | * | | Merge pull request #285 from joseeight/FileIOValerio Virgillito2012-06-08
| | |\ \ \
| | | * | | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| | | |/ /
| | * | | Merge pull request #284 from mencio/timeline-resizer-fixValerio Virgillito2012-06-08
| | |\ \ \
| | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger error part 2Valerio Virgillito2012-06-08
| | | * | | Merge branch 'refs/heads/master' into timeline-resizer-fixValerio Virgillito2012-06-08
| | | |\| |
| | | * | | IKNINJA-1702: Fix the timeline resized throwing a debugger errorValerio Virgillito2012-06-07
| | * | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | fix compile error that was preventing non-gradient brush strokes from being r...Pushkar Joshi2012-06-07
| | | * | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | | |\ \ \