| Commit message (Expand) | Author | Age |
... | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-10 |
| |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | * | | | | | | some code cleanup | Valerio Virgillito | 2012-05-09 |
| | | |_|/ / /
| | |/| | | | |
|
| * | | | | | | put color chips in the inkbottle and fill tool | John Mayhew | 2012-05-10 |
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | 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 |
* | | | | | | | Squashed master into dom-architecture | Valerio Virgillito | 2012-05-16 |
* | | | | | | | Fixing scrollbar syncing, including pan tool, for banner templates. | Nivesh Rajbhandari | 2012-05-15 |
* | | | | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
|\ \ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| * | | | | | | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 |
| * | | | | | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 |
| | |/ / / /
| |/| | | | |
|
* | | | | | | Stage should update scroll offsets when scrolled. Note that this is not alway... | Nivesh Rajbhandari | 2012-05-08 |
* | | | | | | Fixing references to iframe's styles in new template. | Nivesh Rajbhandari | 2012-05-04 |
* | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
|\| | | | | |
|
| * | | | | | 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 |
* | | | | | | Removed special-casing for new template workflow. Instead, we will enforce a... | Nivesh Rajbhandari | 2012-05-04 |
* | | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags. | Nivesh Rajbhandari | 2012-05-04 |
| |/ / / /
|/| | | | |
|
* | | | | | Support drawing in side and top view. Also, adding back support for drawing s... | Nivesh Rajbhandari | 2012-05-01 |
|/ / / / |
|
* | | | | webTemplate var gets reset to false, so must check for new stage template dif... | Nivesh Rajbhandari | 2012-05-01 |
* | | | | Merge branch 'refs/heads/ninja-internal' into StageWebTemplate | Nivesh Rajbhandari | 2012-05-01 |
|\ \ \ \ |
|
| * | | | | Removing some console logs | Valerio Virgillito | 2012-04-30 |
* | | | | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
|/ / / / |
|
* / / / | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
|/ / / |
|
* | | | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 |
|\ \ \
| |_|/
|/| | |
|
| * | | 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 Can... | hwc487 | 2012-04-27 |
| |\ \ |
|
| * | | | 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 Can... | hwc487 | 2012-04-25 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can... | hwc487 | 2012-04-25 |
| |\ \ \ \ |
|
| * | | | | | canvas interaction | hwc487 | 2012-04-23 |
| * | | | | | limits | hwc487 | 2012-04-23 |
* | | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 |
* | | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 |
|\ \ \ \ \ \ |
|
| * | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ... | Valerio Virgillito | 2012-04-26 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Refix brush tool elementAdded event | Jonathan Duran | 2012-04-27 |
* | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
|\ \ \ \ \ \
| | |_|_|/ /
| |/| | | | |
|
| * | | | | | Merge pull request #176 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-04-27 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | /
| | | |_|/
| | |/| | |
|
| | * | | | track the dragging plane based on the hit record so that the file IO works ag... | Pushkar Joshi | 2012-04-26 |
| | * | | | render the calligraphic brush stroke in realtime on a rotated canvas | Pushkar Joshi | 2012-04-25 |
| | * | | | allow the realtime drawing of brush strokes drawn off the standard XY plane b... | Pushkar Joshi | 2012-04-24 |
| | | |/
| | |/| |
|
* | | | | Revert "Fix Brush tool not broadcasting elementAdded event" | Jonathan Duran | 2012-04-27 |
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
|\| | | |
|
| * | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Allow users to toggle application of stroke and border settings when using th... | Nivesh Rajbhandari | 2012-04-24 |
| | * | | Fixing translate handles to draw without zoom value. Also fixed some typos i... | Nivesh Rajbhandari | 2012-04-20 |
| | |/ |
|
* | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 |
|\| | |
|
| * | | re-compute and store the center of the subpath in local coordinates upon file... | Pushkar Joshi | 2012-04-24 |