aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Collapse)AuthorAge
* 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
| * 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>
* | 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
* 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
| | |
* | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
|\ \ \ | |_|/ |/| | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266
| * | disable more menus if the active document is not in design viewAnanya Sen2012-03-22
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
|/ / | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
|/ | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* reverting old pi dataValerio Virgillito2012-03-09
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
|\
| * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| |\
| * \ Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-02-29
| |\ \ | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js
| * \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-28
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-23
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
* | | | | | | | | | | | added close file menu itemAnanya Sen2012-03-06
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge pull request #85 from pushkarjoshi/brushtoolValerio Virgillito2012-02-29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Brushtool
| * | | | | | | | | | changed the registration point of the brush tool icon andPushkar Joshi2012-02-29
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | added a temporary check to prevent extremely long brush strokes
* | | | | | | | | | Merge branch 'ToolFixes' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | integration-candidate
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:10:50 +0000