Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
|\ | |||
| * | 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 |
| * | | | | | | | | | | | More cleaning up | Jose Antonio Marquez | 2012-06-16 |
| * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-15 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Save user's html and body styles and inline body styles for 3d so they don't ... | Nivesh Rajbhandari | 2012-06-14 |
| |/ / / / / / / / / / | |||
* | | | | | | | | | | | 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/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 |
* | | | | | | | | | | 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/ninja-internal' into BodyPI | Nivesh Rajbhandari | 2012-06-07 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | fixing the body color chip for non banners templates | Valerio Virgillito | 2012-06-07 |
| | * | | | | | | | | | | Body PI fixes. | Nivesh Rajbhandari | 2012-06-07 |
| | |/ / / / / / / / / | |||
| | * | | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| * | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge pull request #267 from mqg734/ToolOptions | Valerio Virgillito | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into ToolOptions | Nivesh Rajbhandari | 2012-06-05 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st... | Nivesh Rajbhandari | 2012-06-05 |
| | | * | | | | | | | | | | Fill and Ink-Bottle fixes. | Nivesh Rajbhandari | 2012-06-04 |
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | * | | | | | | | | | | fixing the save as | Valerio Virgillito | 2012-06-05 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #263 from joseeight/Components | Valerio Virgillito | 2012-06-05 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | | * | | | | | | | | Fixing saveAll from menu | Jose Antonio Marquez | 2012-06-04 |
| | | |/ / / / / / / | |||
| | * / / / / / / / | components fix: adding a first draw event to components | Valerio Virgillito | 2012-06-04 |
| | |/ / / / / / / | |||
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 |
| |\| | | | | | | | |||
| | * | | | | | | | fixing some selection container changes and the breadcrumb not drawing initially | Valerio Virgillito | 2012-06-01 |
| | * | | | | | | | Merge branch 'refs/heads/master' into document-bindings-fix | Valerio Virgillito | 2012-06-01 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||
| | | * | | | | | | Attempting to track clean nodes | Jose Antonio Marquez | 2012-05-30 |
| | | | |_|_|_|/ | | | |/| | | | | |||
| | * | | | | | | Merge branch 'refs/heads/valerio-document-bindings-fix' into document-binding... | Nivesh Rajbhandari | 2012-06-01 |
| | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into... | Valerio Virgillito | 2012-06-01 |
| | | |\ \ \ \ \ \ |