aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'binding' of https://github.com/dhg637/ninja-internal into bindingArmen Kesablyan2012-06-15
|\
| * 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 Hud: Calling Option Selection to viewArmen Kesablyan2012-06-15
|/ /
* / 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
| | | |\ \
| | | * | | Overriding scrollbar styles on the template so the scroll track is not white....Nivesh Rajbhandari2012-06-08
| | * | | | 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
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-06-07
| | | |\ \ \
| | | * | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | * | | | enable gradients for brush stroke (in authoring as well as runtime)Pushkar Joshi2012-06-06
| | * | | | | Merge pull request #283 from mqg734/BodyPIValerio Virgillito2012-06-07
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| | | |\ \ \ \ \
| | | * | | | | | Body PI fixes.Nivesh Rajbhandari2012-06-07
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge pull request #281 from joseeight/FileIOValerio Virgillito2012-06-07
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Fixing empty property bug with montage class on HTML tagJose Antonio Marquez2012-06-07
| | | * | | | | Minor fixesJose Antonio Marquez2012-06-07
| | | * | | | | Adding support for html and head tags attributesJose Antonio Marquez2012-06-07
| | | * | | | | Fixing unique ID storeJose Antonio Marquez2012-06-07
| | | * | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
| | | |\| | | |
| | | * | | | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| | | | |_|/ / | | | |/| | |
| | * | | | | fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | |\| | |