aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
|\
| * 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>
* / CSS Panel - Add new panel to panel dataEric Guzman2012-03-13
|/
* 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
| * | | | | | | | | Fixing tooltips and keyboard shortcuts for 3d tools.Nivesh Rajbhandari2012-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNinja-1014 and IKNinja-1015. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | Merge branch 'local-storage-version' of ↵Valerio Virgillito2012-02-27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into integration-candidate
| * | | | | | | | | | removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-24
| |\| | | | | | | | |
| * | | | | | | | | | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | local storage integration and versioningValerio Virgillito2012-02-22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the splitters Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Marking inkbottle as the final tool in the set.Nivesh Rajbhandari2012-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | Adding back Ink Bottle tool in the tool bar so QE can test ink bottle ↵Nivesh Rajbhandari2012-02-24
| | |/ / / / / / / | |/| |