aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* Parameters for twistVertex materialhwc4872012-05-25
|
* Editable material propertieshwc4872012-05-22
|
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-17
|\ | | | | | | Textures
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| |\ | | | | | | | | | WorkingBranch
| * | fixed bug introduced when we removed the color toolbar. The styling of the ↵John Mayhew2012-05-11
| | | | | | | | | | | | color chips in the PI was broken due to a reliance on a css class from the colortoolbar reel. The requried class was copied to the properties.css file as a temporary fix.
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-07
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WorkingBranch Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.html
| * | | More implementation of moving color chips to the individual subtools.John Mayhew2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools
| * | | First round of moving color chips into the sub tools. Shape and Pen tool now ↵John Mayhew2012-05-03
| | | | | | | | | | | | | | | | have chips in the sub tool bar. Still need to complete adding chips to the Brush tool and finalizing the subtool bar layout to our spec for all of the subtools.
* | | | Exposing parameters in Water Materialhwc4872012-05-16
| | | |
* | | | 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 valu