Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | Fixed missing quote from last merge | John Mayhew | 2012-05-07 | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-07 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||
| | * | | | | | updated ninja.css from sass | John Mayhew | 2012-05-07 | |
| | * | | | | | more work on making subtool styling/layout consistent | John Mayhew | 2012-05-07 | |
| | * | | | | | More implementation of moving color chips to the individual subtools. | John Mayhew | 2012-05-07 | |
| | * | | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ... | John Mayhew | 2012-05-03 | |
* | | | | | | | Exposing parameters in Water Material | hwc487 | 2012-05-16 | |
* | | | | | | | More merge problems | hwc487 | 2012-05-14 | |
* | | | | | | | Fixing merge issues | hwc487 | 2012-05-14 | |
* | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 | |
|\| | | | | | | ||||
| * | | | | | | Merge pull request #219 from mqg734/TreeFix | Valerio Virgillito | 2012-05-11 | |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||
| | * | | | | | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 | |
| | * | | | | | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 | |
| | | |_|/ / | | |/| | | | ||||
| * | | | | | Merge pull request #215 from mqg734/WebGLFixes | Valerio Virgillito | 2012-05-11 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-10 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-05-09 | |
| |\ \ \ \ \ | ||||
| | * \ \ \ \ | Merge pull request #185 from ericguzman/StylesControllerPatch | Valerio Virgillito | 2012-05-09 | |
| | |\ \ \ \ \ | ||||
| | | * | | | | | Styles Controller - Fix error when trying dispatch stylesheet change event | Eric Guzman | 2012-05-01 | |
| * | | | | | | | some code cleanup | Valerio Virgillito | 2012-05-09 | |
| |/ / / / / / | ||||
| * | | | | / | Squashed commit of google-components into master | Valerio Virgillito | 2012-05-09 | |
| | |_|_|_|/ | |/| | | | | ||||
| | | * | | | Updating canvas-runtime to use object literal notation. | Nivesh Rajbhandari | 2012-05-10 | |
| | | * | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-08 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| * | | | | | Merge pull request #201 from ericmueller/Snapping | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ \ \ | ||||
| | * | | | | | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 | |
| | * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Sna... | hwc487 | 2012-05-08 | |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #197 from ananyasen/code-editor-patch | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||
| | * | | | | | IKNINJA-1603 | Ananya Sen | 2012-05-08 | |
| | * | | | | | fixed javascript errors | Ananya Sen | 2012-05-07 | |
| | * | | | | | removed incorrect id selector css for code view container since its breaking it. | Ananya Sen | 2012-05-07 | |
| |/ / / / / | ||||
| | * / / / | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 | |
| |/ / / / | ||||
| | | * | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-05-07 | |
| | | |\ \ | | |_|/ / | |/| | | | ||||
| * | | | | reverting to v0.8 flow component for the picasa carousel | Valerio Virgillito | 2012-05-04 | |
| * | | | | Fixing the color popup | Valerio Virgillito | 2012-05-04 | |
| * | | | | Fixing the tools list separators and document bar disabled state | Valerio Virgillito | 2012-05-04 | |
| * | | | | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 | |
| * | | | | fixing the currentContainer | Valerio Virgillito | 2012-05-03 | |
| * | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| |\ \ \ \ | ||||
| | * \ \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ | ||||
| | * \ \ \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ | ||||
| | * | | | | | | Refactor creating elements. Removed makeNJElement and separated the model cre... | Valerio Virgillito | 2012-05-03 | |
| | * | | | | | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ \ | ||||
| | * | | | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el... | Valerio Virgillito | 2012-05-02 | |
| | * | | | | | | | code cleanup | Valerio Virgillito | 2012-05-02 | |
| | | |_|_|/ / / | | |/| | | | | | ||||
| * | | | | | | | integrating the latest montage version | Valerio Virgillito | 2012-05-03 | |
| * | | | | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 | |
| * | | | | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 | |
| * | | | | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 | |
| * | | | | | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 | |
| * | | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| * | | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| |\ \ \ \ \ \ \ |