| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-14 |
| |\ | |||
| | * | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
| |\| | |||
| | * | 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. | ||
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
| |\| | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| | * | | Merge pull request #108 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-13 |
| | |\ \ | | | | | | | | | Brushtool | ||
| | | * | | 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 |
| | | |\ \ | |||
| | | * | | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵ | Pushkar Joshi | 2012-03-02 |
| | | | | | | | | | | | | | | | | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively) | ||
| | * | | | | 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> | ||
| * | | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-12 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | ||
| | * | | | Temp Gradient Fix | Jose Antonio Marquez | 2012-03-09 |
| | |/ / | | | | | | | | | | Temporary fix for getting gradient mode. | ||
| * | | | Tree Node Component - Added method for handling source object set | Eric Guzman | 2012-03-12 |
| | | | | |||
| * | | | CSS Panel - Updating components, created toolbar components, and small ↵ | Eric Guzman | 2012-03-02 |
| |/ / | | | | | | | changes to styles controller | ||
| * | | 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> | ||
| * | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-28 |
| |\ \ | |/ |/| | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | adding some margin to the bread crumb buttons | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | cleanup and fixing selecting each bread crumb | Valerio Virgillito | 2012-02-28 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | breadcrumb cleanup and moving the resized on top of the timeline panel | Valerio Virgillito | 2012-02-27 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-24 |
| |\| | |||
| | * | Adding some missing copyrights | Valerio Virgillito | 2012-02-24 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-23 |
| |\| | |||
| | * | Fixing the breadcrumb button - removing toolbutton class since it is not a ↵ | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | | | | | | tool button Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Updating textfield to only use nj-skinned class and updating input-group to ↵ | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | | | | | check for nj-skinned class instead of textfield class for styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Buttons in the rectangle properties in the tools options need to float left. | Nivesh Rajbhandari | 2012-02-22 |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ | |||
| | * \ | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 |
| | |\ \ | |||
| | * | | | Updated Materials Library and Materials Editor Popup to work with latest ↵ | mqg734 | 2012-02-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error. | ||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-22 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | Merge branch 'refs/heads/master' into new-tool-icons | Armen Kesablyan | 2012-02-22 |
| | |\ \ \ | | | |/ | | |/| | |||
| | * | | | Tool Button Fixes | Armen Kesablyan | 2012-02-16 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | New Icons: Last set had imperfections | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| | * | | | Tool Icons : New layout | Armen Kesablyan | 2012-02-15 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-22 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵ | Valerio Virgillito | 2012-02-21 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | cleanup of the breadcrumb | Valerio Virgillito | 2012-02-20 |
| | | | |/ | | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | fixing the dirty flag and removing sass changes | Valerio Virgillito | 2012-02-21 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | - file picker - select file on double click | Ananya Sen | 2012-02-21 |
| |/ / / | | | | | | | | | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/FileIO-jose' into FileIO | Ananya Sen | 2012-02-17 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||