| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| | | * | | | 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> | |||
| * | | | | 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 | |
| | |\| | | | | ||||
| | | * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-25 | |
| | | |\| | | | ||||
| | | * | | | | Fixed materials editor popup not refreshing correctly. | Nivesh Rajbhandari | 2012-04-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | | | 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> | |||
| * | | | | | | Timeline: Handling of multiselect of elements from stage. | Jon Reid | 2012-04-25 | |
| | | | | | | | ||||
| * | | | | | | Timeline: New tracking for multiple selected layers. | Jon Reid | 2012-04-25 | |
| |/ / / / / | ||||
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| | * | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | more backup fixes for the old stage | Valerio Virgillito | 2012-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | Turn on width and height as tweenable properties | Jonathan Duran | 2012-04-24 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | Change sublayer property names to match css property names | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | Fix Select All bug and remove debuggers | Jonathan Duran | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | |||
| * | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-20 | |
| |\ \ \ \ \ | ||||
| | * | | | | | Timeline: More bug fixes for selection with multiple documents opening and | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | closing. | |||
| | * | | | | | Timeline: Bug fix: check for uninitialized currentDocument in intialization | Jon Reid | 2012-04-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | routine. | |||