| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 |
| |\ | |||
| | * | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| | |\ | | | | | | | Brushtool | ||
| | * \ | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| | |\ \ | | | | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | | * | | fixed logical error in triggering menu item | Ananya Sen | 2012-03-26 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | - removed menu-data boundObj path support for now | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error on clicking on disabled menu item Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while rendering | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | file picker - added size unit | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | new file - don't disable OK is file exists Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on ↵ | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | window resize Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | * | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-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> | ||
| * | | | | render the pen path with local coordinates, but use stage world coordinates ↵ | Pushkar Joshi | 2012-04-02 |
| | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | to position the canvas on which the path is rendered AND add data-montage- to the ids in the pen and brush reels AND fix a bug with pen stroke transparency not working | ||
| * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| |\| | | |||
| | * | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| | |\ \ | | | | | | | | | Resizers refactoring | ||
| | | * | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | | |/ | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | | * | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
| | | |\ | | | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ... | ||
| | | | * | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵ | Ananya Sen | 2012-03-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | * | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-22 |
| | |\ \ \ | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox. | ||
| | | * | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Fixed the lock button for the shape properties bar | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| | |/ / | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * / | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| |\| | |||
| | * | adding a focus manager to handle panel bugs where blur was not getting ↵ | Valerio Virgillito | 2012-03-14 |
| | | | | | | | | | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| |\| | |||
| | * | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge pull request #112 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-03-13 |
| | |\ | | | | | | | Presets panel - Ninja-leaf hover state | ||
| | | * | Presets Panel - Remove :active pseudo class from ninja-leaf | Eric Guzman | 2012-03-13 |
| | | | | |||
| | | * | Presets Panel - Add :active pseudo class for ninja-tree | Eric Guzman | 2012-03-13 |
| | | | | |||
| | | * | Presets Panel - Adding hover state to ninja-leaf | Eric Guzman | 2012-03-13 |
| | | | | |||
| | * | | Gradient stop logic | Jose Antonio Marquez | 2012-03-13 |
| | | | | | | | | | | | | | Made logic changes to allow for a minimum number of gradients to remain at 2 at all times and not apply default colors. | ||
| * | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | |||
| * | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| |\| | | |||
| | * | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| | |\ \ | | | | | | | | | Brushtool | ||
| | * \ \ | Merge pull request #105 from joseeight/FileIO-Build-Candidate | Valerio Virgillito | 2012-03-13 |
| | |\ \ \ | | |_|/ | |/| | | File I/O adding webGL/canvas data functionality | ||
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-09 |
| | | |\ \ | |||
| | | * | | | updated file picker image icons | Ananya Sen | 2012-03-06 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | Merge dhg637 DisabledState into master. | Valerio Virgillito | 2012-03-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb | Armen Kesablyan | 2012-03-12 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| | | | | | |||
| * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-12 |
| |\| | | | |_|/ |/| | | |||
| | * | | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | |/ | | | | | | | Temporary fix for getting gradient mode. | ||
| * | | bug fixes for spline interpolation | Pushkar Joshi | 2012-03-12 |
| | | | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code) | ||
| * | | brush stroke options for calligraphic brush style | Pushkar Joshi | 2012-03-08 |
| | | | |||
| * | | implement stroke hardness such that it is percentage of the stroke width ↵ | Pushkar Joshi | 2012-03-07 |
| | | | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options | ||
| * | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-02 |
| |\| | |||
| | * | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵ | Valerio Virgillito | 2012-02-29 |
| | |\ | | | | | | | | | | integration-candidate | ||
| | | * | We need to remove color buttons from the color model when updating the PI ↵ | Nivesh Rajbhandari | 2012-02-28 |
| | | | | | | | | | | | | | | | | | | | for selection change. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||