aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'master' into pentoolPushkar Joshi2012-03-14
|\
| * Some code cleanup - removing unused assignments.Valerio Virgillito2012-03-13
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #112 from ericguzman/PresetsPanelValerio Virgillito2012-03-13
| |\ | | | | | | Presets panel - Ninja-leaf hover state
| | * Presets Panel - Remove :active pseudo class from ninja-leafEric Guzman2012-03-13
| | |
| | * Presets Panel - Add :active pseudo class for ninja-treeEric Guzman2012-03-13
| | |
| | * Presets Panel - Adding hover state to ninja-leafEric Guzman2012-03-13
| | |
| * | Gradient stop logicJose Antonio Marquez2012-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 strokesPushkar Joshi2012-03-14
| | |
* | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
|\| |
| * | Merge pull request #108 from pushkarjoshi/brushtoolValerio Virgillito2012-03-13
| |\ \ | | | | | | | | Brushtool
| * \ \ Merge pull request #105 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-13
| |\ \ \ | | |_|/ | |/| | File I/O adding webGL/canvas data functionality
| | * | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | |\ \
| | * | | updated file picker image iconsAnanya Sen2012-03-06
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-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, breadcrumbArmen Kesablyan2012-03-12
| | |/ / | |/| | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | | |
* | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | |_|/ |/| |
| * | Temp Gradient FixJose Antonio Marquez2012-03-09
| |/ | | | | | | Temporary fix for getting gradient mode.
* | bug fixes for spline interpolationPushkar Joshi2012-03-12
| | | | | | | | | | | | | | AND Laplacian smoothing for denoising AND code cleanup (removing blocks of commented code)
* | brush stroke options for calligraphic brush stylePushkar Joshi2012-03-08
| |
* | implement stroke hardness such that it is percentage of the stroke width ↵Pushkar Joshi2012-03-07
| | | | | | | | | | | | | | that's fully the color of the brush AND add a smoothing flag for the brush options
* | Merge branch 'master' into brushtoolPushkar Joshi2012-03-02
|\|
| * Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into ↵Valerio Virgillito2012-02-29
| |\ | | | | | | | | | integration-candidate
| | * We need to remove color buttons from the color model when updating the PI ↵Nivesh Rajbhandari2012-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 Virgillito2012-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 buttonsValerio Virgillito2012-02-28
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * cleanup and fixing selecting each bread crumbValerio Virgillito2012-02-28
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Catmull-Rom spline sampling for the brush stroke, and options for stroke ↵Pushkar Joshi2012-03-02
|/ / | | | | | | size, stroke hardness and both stroke colors (left and right --- temporarily using the stroke and fill colors respectively)
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-24
|\|
| * Adding some missing copyrightsValerio Virgillito2012-02-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-23
|\|
| * Fixing the breadcrumb button - removing toolbutton class since it is not a ↵Valerio Virgillito2012-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 Rajbhandari2012-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 Rajbhandari2012-02-22
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * \ Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| * | | Updated Materials Library and Materials Editor Popup to work with latest ↵mqg7342012-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 FileIOJose Antonio Marquez2012-02-22
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ \ \ | | | |/ | | |/|
| * | | Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-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 Virgillito2012-02-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| | | |/ | | |/| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | - file picker - select file on double clickAnanya Sen2012-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 FileIOAnanya Sen2012-02-17
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\ \