aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| | | | Added visual feedback for the timeline resizer
* New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| | | | Added new CSS/HTML layout for the breadcrumb component.
* adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Improving Document Bar UIJose Antonio Marquez2012-07-12
| | | | Setting up new document bar UI to then set up switching document view modes. Improving layout of component and cleaning up. Added icons and button UI.
* fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09
|
* cleaned up remaining copyrights for releaseJohn Mayhew2012-07-09
|
* Normalize HTML DOCTYPEKris Kowal2012-07-09
| | | | | | | Was lower-case. Now upper-case. Also fixed BOMs, trailing white-space, DOS line terminators. Did not expand tabs to spaces.
* BSD LicenseKris Kowal2012-07-09
|
* Merge branch 'normalize' of https://github.com/kriskowal/ninja-internalValerio Virgillito2012-07-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Normalize HTML doctypeKris Kowal2012-07-06
| |
| * Remove byte order markers (BOM)Kris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Remove trailing spacesKris Kowal2012-07-06
| |
| * Expand tabsKris Kowal2012-07-06
| |
* | Merge branch 'GIO-TextTool' of https://github.com/dhg637/ninja-internalValerio Virgillito2012-07-09
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/text-properties.reel/text-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Text Tool 2Armen Kesablyan2012-07-03
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
| |\ \
| * | | Bug: Font Name & Size not updating text toolArmen Kesablyan2012-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge pull request #371 from ananyasen/menu-bug-fixValerio Virgillito2012-07-09
|\ \ \ \ | | | | | | | | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up a...
| * | | | fixed IKNINJA-1877 : Clicking on a menu item should commit on mouse up and ↵Ananya Sen2012-07-03
| | |/ / | |/| | | | | | | | | | | | | | | | | | not on mouse down. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge pull request #366 from joseeight/ColorValerio Virgillito2012-07-09
|\ \ \ \ | | | | | | | | | | Fix: IKNINJA-1634
| * | | | Fix: IKNINJA-1634Jose Antonio Marquez2012-07-02
| |/ / / | | | | | | | | | | | | Fixing reference error for gradient stops on click.
* | | | Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Update copyright boilerplateKris Kowal2012-07-06
| |/ /
* / / PI, drawing and editing fixes for shapes and materials.Nivesh Rajbhandari2012-07-09
|/ / | | | | | | | | | | | | | | | | | | | | | | IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Changing the livePreview button to do a chromePreview and keeping the canvas ↵Valerio Virgillito2012-06-28
| | | | | | | | | | | | when doing a timeline play Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Fixing IKNINJA-1634Jose Antonio Marquez2012-06-27
| |
* | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-26
|\|
| * Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26
| |\ | | | | | | Binding View - Binding Tool & Binding Panel
| | * Text Tool Fix - Can Not Switch Document when Text Tool InitializedArmen Kesablyan2012-06-23
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * Hintable - Remove overridden methodEric Guzman2012-06-21
| | |
| | * Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-21
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/hintable.reel/hintable.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-21
| | | |\
| | * | | Binding View - Minor Fixes to remove warningsArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: node_modules/montage/ui/application.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \
| | * | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-20
| | |\| | |
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-20
| | | |\ \ \
| | * | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-19
| | | |\ \ \ \
| | * | | | | | Hintable - Fix editable/hintable value property so it is bindable.Eric Guzman2012-06-18
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-11
| | | |\ \ \ \ \
| | | * | | | | | Initial Text Tool ChangesArmen Kesablyan2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | | | | | Hintable - Array type check fix for arrays created with map() method.Eric Guzman2012-06-10
| | | | | | | | |
| | * | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * \ \ \ \ \ \ \ \ \ Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
| | |\ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 09:19:45 +0000