| Commit message (Expand) | Author | Age |
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-15 |
|\ |
|
| * | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 |
| * | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
* | | fixed bug introduced when we removed the color toolbar. The styling of the co... | John Mayhew | 2012-05-11 |
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Wor... | John Mayhew | 2012-05-07 |
|\| |
|
| * | Fixing the color popup | Valerio Virgillito | 2012-05-04 |
| * | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 |
| * | 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 |
| | * | | | code cleanup | Valerio Virgillito | 2012-05-02 |
| * | | | | 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 |
| * | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ |
|
| | | * \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-23 |
| | | |\ \ \ \ |
|
| | | * | | | | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 |
| * | | | | | | | 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: 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 |
| | | | |_|_|/
| | | |/| | | |
|
| | * / | | | | Dom Manipulation | Kruti Shah | 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 |
| | |/ / / / |
|
| * / / / / | Updating id to data-montage-id (and associated CSS, if necessary) in some of ... | Nivesh Rajbhandari | 2012-04-30 |
| |/ / / / |
|
* | | | | | 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 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 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | 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 |
| * | | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ... | Valerio Virgillito | 2012-04-26 |
| |\ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| | * | | | | | Removing all "module" declarations and replaced with "prototype" in preparati... | John Mayhew | 2012-04-26 |
| | | |/ / /
| | |/| | | |
|
* | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
|\| | | | | |
|
| * | | | | | Merge pull request #178 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-26 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | We don't currently support perspective values on individual elements, so remo... | Nivesh Rajbhandari | 2012-04-26 |
| | |/ / / |
|
* | | | | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 |
* | | | | | Timeline: Deleting elements now deletes associated layers. | Jon Reid | 2012-04-26 |
* | | | | | Timeline: comment out a conditional debugger; re-enable layer name storage. | Jon Reid | 2012-04-26 |
* | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-26 |
|\ \ \ \ \ |
|
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 |
| |\| | | | |
|
| | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 |
| | |\| | | |
|