| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-11 |
| |\ | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js | ||
| | * | Removing obsolete treeList reference in preset templates. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Removing outdated tree-controller. | Nivesh Rajbhandari | 2012-05-11 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Fixing the color popup | Valerio Virgillito | 2012-05-04 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 |
| | |\ | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | 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 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | code cleanup | Valerio Virgillito | 2012-05-02 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | 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 |
| | | |\ \ \ | | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1] | ||
| | | | * \ \ | 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 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | 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 | ||
| | | | * | | | | | 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 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@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 |
| | | |/ / / / | |||
| | * / / / / | 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> | ||
| * | | | | | Material editor | hwc487 | 2012-05-02 |
| | | | | | | |||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-27 |
| |\| | | | | | | | | | | | | | | | | | | | Textures | ||
| | * | | | | 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 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | 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 '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 | ||
| | * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-27 |
| | |\| | | | | | |||
| | | * | | | | | Merge pull request #178 from mqg734/PerspectiveFix | Valerio Virgillito | 2012-04-26 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | IKNINJA-1511 - We don't currently support perspective values on individual elements, so removing perspective values from the animation presets. | ||
| | | | * | | | | We don't currently support perspective values on individual elements, so ↵ | Nivesh Rajbhandari | 2012-04-26 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | Fix WEbGL not rendering on stage with timeline | Jonathan Duran | 2012-04-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | * | | | | | 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 |
| | | |\| | | | | |||
| | * | | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document change | Jon Reid | 2012-04-26 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes. | ||
| | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-04-25 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Timeline Bug Fix : 1541 | Kruti Shah | 2012-04-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||