| Commit message (Expand) | Author | Age |
* | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-21 |
|\ |
|
| * | Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate | Jonathan Duran | 2012-06-20 |
| |\ |
|
| * \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
| |\ \ |
|
| * \ \ | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-11 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-05 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | 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: Fix element insertion to use new TimelinePanel properties and | Jon Reid | 2012-05-18 |
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-05-22 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|
| * | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-05-14 |
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Color | Jose Antonio Marquez | 2012-06-20 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | fixing the css bugs with montage v11 | Valerio Virgillito | 2012-06-18 |
| * | | | | | | | | Merge branch 'refs/heads/master' into montage-v11-integration | Valerio Virgillito | 2012-06-18 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| * | | | | | | | | updating the components and descriptor.json to support montage v.11 | Valerio Virgillito | 2012-06-17 |
| | |_|_|_|_|_|/
| |/| | | | | | |
|
* | | | | | | | | Adding transparent background to color chip buttons | Jose Antonio Marquez | 2012-06-20 |
| |/ / / / / /
|/| | | | | | |
|
* | | | | | | | Fixing apply 'no color' | Jose Antonio Marquez | 2012-06-15 |
|/ / / / / / |
|
* | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-12 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | remove serializable from custom section | Valerio Virgillito | 2012-06-12 |
| * | | | | | | | adding more nonexistent properties | Valerio Virgillito | 2012-06-12 |
| * | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| |\ \ \ \ \ \ \
| | | |_|_|_|_|/
| | |/| | | | | |
|
| * | | | | | | | first iteration of adding serializable to ninja plus other changes to run the... | Valerio Virgillito | 2012-06-06 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | We need to guard against cases where some PI controls are using HottextUnit b... | Nivesh Rajbhandari | 2012-06-13 |
* | | | | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes | Nivesh Rajbhandari | 2012-06-13 |
|\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| * | | | | | | Fixing typo. | Nivesh Rajbhandari | 2012-06-11 |
| * | | | | | | Removing unused requires from 3d PI section. | Nivesh Rajbhandari | 2012-06-11 |
| * | | | | | | IKNinja-1377 - Global rotation does not work if object is translated in z. | Nivesh Rajbhandari | 2012-06-11 |
| | |/ / / /
| |/| | | | |
|
* / | | | | | Fixing properties panel to support px and % for body and other elements. | Nivesh Rajbhandari | 2012-06-12 |
|/ / / / / |
|
* / / / / | fixing the body color chip for non banners templates | Valerio Virgillito | 2012-06-07 |
|/ / / / |
|
* | | | | fixing selection when switching documents | Valerio Virgillito | 2012-05-31 |
* | | | | fixing the closing of documents | Valerio Virgillito | 2012-05-30 |
* | | | | Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal into... | Valerio Virgillito | 2012-05-30 |
|\ \ \ \ |
|
| * | | | | PI's 3d section was not binding correctly to the current document. | Nivesh Rajbhandari | 2012-05-30 |
* | | | | | fixing the timeline current document bindings | Valerio Virgillito | 2012-05-30 |
|/ / / / |
|
* | | | | Fixing the close document. | Valerio Virgillito | 2012-05-30 |
* | | | | document bindings phase 1 | Valerio Virgillito | 2012-05-29 |
| |_|/
|/| | |
|
* | | | fix for the id and class controls in the pi | Valerio Virgillito | 2012-05-25 |
* | | | Cleaning up referencing to 'documentRoot' and '_document' | Jose Antonio Marquez | 2012-05-24 |
* | | | fixing the undefined 'color' issue | Valerio Virgillito | 2012-05-22 |
* | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-18 |
|\ \ \ |
|
| * | | | fixing the color chip for the document root | Valerio Virgillito | 2012-05-18 |
* | | | | Fixing radio control in the PI. | Nivesh Rajbhandari | 2012-05-18 |
* | | | | Fixing button controls in the Properties Panel for changes in montage v.10 dr... | Nivesh Rajbhandari | 2012-05-18 |
|/ / / |
|
* | | | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
* | | | Adding a disabled property to the label-checkbox. | Valerio Virgillito | 2012-05-17 |
* | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-16 |
|\ \ \
| | |/
| |/| |
|
| * | | fixed bug introduced when we removed the color toolbar. The styling of the co... | John Mayhew | 2012-05-11 |
| |/ |
|
* | | adding a null check. | Valerio Virgillito | 2012-05-16 |
* | | Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-interna... | Valerio Virgillito | 2012-05-16 |
|\ \ |
|