| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| |\ | |||
| | * | Merge pull request #191 from imix23ways/TimelineUber | Valerio Virgillito | 2012-05-03 |
| | |\ | | | | | | | Timeline uber | ||
| | | * | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-05-01 |
| | | |\ | |||
| | | | * | Timeline: bug fix: disable bread crumb setlevel. | Jon Reid | 2012-04-30 |
| | | | | | |||
| | | | * | Timeline: Change serialization parameters for some component properties. | Jon Reid | 2012-04-30 |
| | | | | | |||
| | | | * | Timeline: Replace id with data-montage-id in all reels. | Jon Reid | 2012-04-27 |
| | | | | | |||
| | * | | | minor formatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'Master-Dom-Manipulation' of ↵ | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ | | | | | | | | | | | | | | | | https://github.com/ntfx47/ninja-internal | ||
| | | * | | | Dom Manipulation | Kruti Shah | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 |
| |\ \ \ \ \ | |||
| | * | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 |
| | | | | | | | |||
| | * | | | | | Changing ID to Montage-ID for Color Components | Jose Antonio Marquez | 2012-05-03 |
| | |/ / / / | |||
| * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| |\| | | | | |||
| | * | | | | Support drawing in side and top view. Also, adding back support for drawing ↵ | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Draw a red outline around the stage for reference when rotating stage. | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Offset side and top working planes by half the stage width/height. | Nivesh Rajbhandari | 2012-05-01 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | webTemplate var gets reset to false, so must check for new stage template ↵ | Nivesh Rajbhandari | 2012-05-01 |
| | | | | | | | | | | | | | | | | | | | | | | | | | differently. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplate | Nivesh Rajbhandari | 2012-05-01 |
| | |\| | | |||
| | | * | | Removing some console logs | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | |/ / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
| | |\ \ | | |/ | |/| | Canvas interaction | ||
| | | * | added a console.log to show the working plane during a drag | hwc487 | 2012-04-27 |
| | | | | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| | | |\ | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | Creating shapes in a container | hwc487 | 2012-04-27 |
| | | | | | |||
| | | * | | canvas interaction | hwc487 | 2012-04-26 |
| | | | | | |||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | | |\ \ | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | | | Snapping tocontained objects | hwc487 | 2012-04-24 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-24 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Canvas-interaction | ||
| | | * | | | | | canvas interaction | hwc487 | 2012-04-23 |
| | | | | | | | | |||
| | | * | | | | | limits | hwc487 | 2012-04-23 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Updating id to data-montage-id. | ||
| | * | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵ | Nivesh Rajbhandari | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * / / / / / / | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | ||
| | | * \ \ \ \ \ | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | | |\ \ \ \ \ \ | |||
| | | * | | | | | | | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵ | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-24 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||
| | | * | | | | | | | | Added a body controller | Valerio Virgillito | 2012-04-24 |
| | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵ | Valerio Virgillito | 2012-04-26 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | serialization | ||
| | | * | | | | | | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully | ||
| * | | | | | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||