Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Cod... | Ananya Sen | 2012-03-28 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | - Highlight Matching bracket | Ananya Sen | 2012-03-27 | |
| * | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||
| | | * | | | | | | | | | 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 | |
| | * | | | | | | | | | | | Merge branch 'Master-Dom-Manipulation' of https://github.com/ntfx47/ninja-int... | Valerio Virgillito | 2012-05-03 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||
| | | * | | | | | | | | | | Dom Manipulation | Kruti Shah | 2012-05-03 | |
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| * | | | | | | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 | |
| * | | | | | | | | | | | 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 s... | Nivesh Rajbhandari | 2012-05-01 | |
| | * | | | | | | | | | | Draw a red outline around the stage for reference when rotating stage. | Nivesh Rajbhandari | 2012-05-01 | |
| | * | | | | | | | | | | Offset side and top working planes by half the stage width/height. | 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 #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ... | Nivesh Rajbhandari | 2012-04-30 | |
| * | | | | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 | |
| |/ / / / / / / / / | ||||
| * | / / / / / / / | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 | |
| | |/ / / / / / / | |/| | | | | | | | ||||
* | | | | | | | | | 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 | |
| |/ / / / / / / |/| | | | | | | | ||||
* | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | Snapping tocontained objects | hwc487 | 2012-04-24 | |
| * | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Can... | hwc487 | 2012-04-24 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja... | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ | 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 | |
| | * | | | | | | | | | | | | Simplifying the getElement method from stage and adding an exclusion list to ... | Valerio Virgillito | 2012-04-26 | |
| | * | | | | | | | | | | | | 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 |