aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
|\ | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
|\| | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * CSS Panel - Update components to use new serialization formatEric Guzman2012-05-22
| |
| * Remove Old CSS PanelEric Guzman2012-05-21
| |
| * Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * fixed the shape subtool not refreshing the iconValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-17
| |\| | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
| | * code cleanup and refactoring of the document controller and stage viewValerio 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>
| | * | fixing some of the document bindings.Valerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | 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 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
| | |\ \
| | * | | More clean up, updating menu itemsJose Antonio Marquez2012-05-01
| | | | |
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | | | |
| | * | | 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
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
| |\ \ \ \ \ \ \
| * | | | | | | | CSS Panel - Add new panel to panel dataEric Guzman2012-03-13
| | | | | | | | |
* | | | | | | | | copy/paste POCAnanya Sen2012-05-07
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Added a body controllerValerio Virgillito2012-04-24
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | initial stage web templateValerio Virgillito2012-04-18
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge pull request #164 from mqg734/ToolTipFixesValerio Virgillito2012-04-17
|\ \ \ \ \ | | | | | | | | | | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for PaintBucket, InkBottle and Eyedropper tools.
| * | | | | IKNinja-1022 - PaintBucket tooltip is incorrect. Also added kb shortcuts for ↵Nivesh Rajbhandari2012-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PaintBucket, InkBottle and Eyedropper tools. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Fixing selection/tag layout drawing when canvas and image elements have borders.Nivesh Rajbhandari2012-04-12
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* / | | | adding a history panelValerio Virgillito2012-04-09
|/ / / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #159 from mqg734/WebGLMaterialsValerio Virgillito2012-04-09
|\ \ \ \ | |_|_|/ |/| | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes.
| * | | IKNinja-1410 - Inner Radius should be restricted to 99%.Nivesh Rajbhandari2012-04-02
| | |/ | |/| | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #153 from mencio/componentsValerio Virgillito2012-04-05
|\ \ \ | | | | | | | | Components panel cleanup and displaying only simple properties.
| * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-04-04
| |\| |
| * | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-30
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-03-28
| |\ \ \ \
| * | | | | Cleanup of the components panelValerio Virgillito2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | [CR] Keep Save related menu items always enabled, if there is an open documentAnanya Sen2012-04-04
| |_|_|/ / |/| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge pull request #148 from ananyasen/integration-candidateValerio Virgillito2012-04-01
|\ \ \ \ \ | |_|_|/ / |/| | | | added text paste detection and updated some menu items
| * | | | IKNINJA-719 - removed Zoom In/Zoom Out under View menu in the Main menuAnanya Sen2012-03-28
| | |/ / | |/| | | | | | | | | | | | | | | | | | Disabled cut, copy, paste, debug, since that functionality is not there yet Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
|\ \ \ \ | |/ / / |/| | | Brushtool
| * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| |\| | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * | | revert to using the angle without flipping its sign...fixing some minor bugs ↵Pushkar Joshi2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step
| * | | update values in the PI from values of the selected brush stroke or pen tool ↵Pushkar Joshi2012-03-15
| | | | | | | | | | | | | | | | path
| * | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 08:31:37 +0000