aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Collapse)AuthorAge
* 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>
| * Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\
| | * \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\ \
| | * | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
| | | | | | | | | | | | | | | | | | | | Only for saving basic components without a reel.
| * | | | Timeline should not select an element when a layer is selected by code.Valerio Virgillito2012-05-16
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | 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.
| * | | | | removing first draw on the component eventValerio Virgillito2012-05-16
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | adding a null check.Valerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | adding data-montage-id to the componentsValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Squashed master into dom-architectureValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | | | Removing the old checkbox components. Created a new LabelCheckboxValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Removed Old Objects Panel StructureArmen Kesablyan2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | Objects Panel - Add object componentEric Guzman2012-05-16
| | | | | |
* | | | | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| * | | | | renaming the position and size componentValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | reverting a pi width changeValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fixing the body piValerio Virgillito2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-11
| |\| | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | | | Adding support for new templatesJose Antonio Marquez2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | This is supported for NEW and OPEN, SAVE is not supported yet by I/O. Saving works, but it will not be a banner template.
| * | | | | fixing the timeline selecting when creating a new layerValerio Virgillito2012-05-11
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Partially fixing the body pi and fixing the selection controllerValerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixing the components double click center stage position.Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixing the select and text area PIValerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the components for the new domValerio Virgillito2012-05-09
| | |/ / | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/masterDomArc' into bindingArmen Kesablyan2012-05-14
|\ \ \ \ | | |_|/ | |/| |
| * | | 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>
* | | Workspace: has customizedArmen Kesablyan2012-05-14
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
|/ / | | | | | | Signed-off-by: Armen Kesablyan <armen@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
|\ \ \ \ | | |_|/ |