aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-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 Rajbhandari2012-05-11
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Removing outdated tree-controller.Nivesh Rajbhandari2012-05-11
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-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.0Valerio Virgillito2012-05-03
| | |\
| | * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-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 Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | code cleanupValerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| | |\ \ \ | | | | | | | | | | | | submitting project : Code Editor Improvements [Phase 1]
| | | * \ \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-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-improvementsAnanya Sen2012-04-23
| | | |\ \ \ \
| | | * | | | | - collapse panels for code view, restore for design viewAnanya Sen2012-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-idValerio Virgillito2012-05-03
| |\| | | | | |
| | * | | | | | Merge pull request #191 from imix23ways/TimelineUberValerio Virgillito2012-05-03
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | Timeline uber
| | | * | | | | Timeline: bug fix: disable bread crumb setlevel.Jon Reid2012-04-30
| | | | | | | |
| | | * | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | | | |
| | | * | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | | |_|_|/ | | | |/| | |
| | * / | | | Dom ManipulationKruti Shah2012-05-03
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \
| | * | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | |/ / / /
| * / / / / Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-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 editorhwc4872012-05-02
| | | | |
* | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-04-27
|\| | | | | | | | | | | | | | | | | | | Textures
| * | | | Merge cleanupValerio Virgillito2012-04-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\ \ \ \
| | * \ \ \ Merge branch 'stage-document-architecture' of ↵Valerio Virgillito2012-04-26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization
| | | * \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Fixing the element model and adding get elementValerio Virgillito2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into ↵Valerio Virgillito2012-04-26
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | serialization
| | | * | | | | Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | preparation for montage converting to the new "prototype" format fully
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-27
| |\| | | | |
| | * | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-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 Rajbhandari2012-04-26
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fix WEbGL not rendering on stage with timelineJonathan Duran2012-04-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | Timeline: Deleting elements now deletes associated layers.Jon Reid2012-04-26
| | | | | |
| * | | | | Timeline: comment out a conditional debugger; re-enable layer name storage.Jon Reid2012-04-26
| | | | | |
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-26
| |\ \ \ \ \
| | * | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| | |\| | | |
| * | | | | | Timeline: Decouple Timeline and Breadcrumb. Remove most document changeJon Reid2012-04-26
| |/ / / / / | | | | | | | | | | | | | | | | | | event handlers. Bind Timeline to currentSelectedElement. Various bug fixes.
| * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-04-25
| |\ \ \ \ \
| | * | | | | Timeline Bug Fix : 1541Kruti Shah2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>