Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Binding View :Requested Changes for Pull Request | Armen Kesablyan | 2012-06-21 |
* | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-21 |
|\ | |||
| * | remove old method | Jonathan Duran | 2012-06-20 |
| * | remove unneeded files | Jonathan Duran | 2012-06-20 |
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
| |\ | |||
| * \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-18 |
| |\ \ | |||
| * | | | Timeline: Replace currentSelectedContainer with new model.domContainer. | Jon Reid | 2012-06-15 |
| * | | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-11 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-06 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 |
| | |\ \ \ \ \ \ | |||
| * | | | | | | | | Sub Props | Kruti Shah | 2012-06-12 |
| * | | | | | | | | Color chip in TP | Kruti Shah | 2012-06-08 |
| * | | | | | | | | Color Chip | Kruti Shah | 2012-05-31 |
| |/ / / / / / / | |||
| * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-31 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-22 |
| |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | Timeline: Bug fixes for deleting elements. | Jon Reid | 2012-05-18 |
| | * | | | | | | | | Timeline: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 |
| | * | | | | | | | | Timeline: Multiselect improvements. New convenience methods. Multiselect | Jon Reid | 2012-05-17 |
* | | | | | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-20 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #298 from ericmueller/Textures | Valerio Virgillito | 2012-06-19 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | |||
| | * | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | | Merge branch 'Textures' of github.com:ericmueller/ninja-internal into Textures | hwc487 | 2012-05-03 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | Updated hard-coded linear and radial gradients to use the color values in Lin... | Nivesh Rajbhandari | 2012-05-03 |
| | * | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Material editor | hwc487 | 2012-05-02 |
* | | | | | | | | | | | | | | | Objects Tray - Filter list of components for those without visual representation | Eric Guzman | 2012-06-20 |
* | | | | | | | | | | | | | | | Merge branch 'binding' of github.com:dhg637/ninja-internal into binding | Eric Guzman | 2012-06-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | Binding View - Mouse Over Element Pop up Hud | Armen Kesablyan | 2012-06-19 |
* | | | | | | | | | | | | | | | | Objects Tray - Show only "off stage" objects | Eric Guzman | 2012-06-19 |
|/ / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into binding | Armen Kesablyan | 2012-06-19 |
|\| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | More cleaning up | Jose Antonio Marquez | 2012-06-16 |
| * | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ... | Nivesh Rajbhandari | 2012-06-14 |
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |||
| * / | | | | | | | | | | | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
| |/ / / / / / / / / / / / | |||
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | fixed document switching issues | Valerio Virgillito | 2012-06-12 |
| | * | | | | | | | | | | | | hack fix for the PI section throwing errors when dom is not ready to draw | Valerio Virgillito | 2012-06-12 |
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||
| * / | | | | | | | | | | | Fixing properties panel to support px and % for body and other elements. | Nivesh Rajbhandari | 2012-06-12 |
| |/ / / / / / / / / / / | |||
| * | | | | | | | | | / | rewrite: currentSelectedContainer -> domContainer | Valerio Virgillito | 2012-06-08 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
* | | | | | | | | | | | Objects Controller - Fix call to get current object bindings after add/removi... | Eric Guzman | 2012-06-13 |