aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixing logic for popup value bubblingJose Antonio Marquez2012-06-23
| | | | Only working for HSV, need to implement HEX and gradient
* Deleting obsolete filesJose Antonio Marquez2012-06-23
|
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
|\
| * Merge pull request #331 from mencio/picasa-fixValerio Virgillito2012-06-22
| |\ | | | | | | fixing the size of the picasa images
| | * fixing the size of the picasa imagesValerio Virgillito2012-06-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Added third gradient chip popupJose Antonio Marquez2012-06-22
| | | | | | | | | | | | Need to add support for gradient events dispatching from standalone chips. Just need to hook up relays for events besides HSV to bubble up.
* | | Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
| | | | | | | | | | | | It seems that from-to stops are omitted if using objects with no 0 and/or 100 percent stops, seems like browser induced, but can't confirmed, bug never reported, but this should fix it.
* | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
|\| |
| * | Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
| |\ \ | | |/ | |/| Draw stage left and top references lines. Also fixed IKNinja-1720.
| | * Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Have to guard against cases when stage lines are parallel to the canvas and ↵Nivesh Rajbhandari2012-06-22
| | | | | | | | | | | | | | | | | | the line intersection routine returns null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * IKNINJA-1720 - Object in a document erases 3D grid in other document when ↵Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | | | | | | | switching with document tabs. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Draw stage left and top references lines.Nivesh Rajbhandari2012-06-21
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge pull request #327 from mencio/component-fixesValerio Virgillito2012-06-22
| |\ \ | | | | | | | | Fixed issue with Youtube not updating after save and Picasa background
| | * | Fixed issue with Youtube not updating after save and Picasa bacgroundValerio Virgillito2012-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Fix closing logic and init color on chipJose Antonio Marquez2012-06-22
| | | | | | | | | | | | | | | | Added improved logic to handle toggling from button the color popup. Also added an init color method for the chip to initialize color in it's popup.
* | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
|\| | |
| * | | Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| |\ \ \ | | |_|/ | |/| | copy cut paste - project phase 1 check in
| | * | removed some redundantsAnanya Sen2012-06-21
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| | |\|
| | * | - added io api to generate file from binaryAnanya Sen2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | - refactoring and cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \
| | * \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \ \
| | * | | | Notify for adding multiple elements together, to fix IKNINJA-1775 [Drawing a ↵Ananya Sen2012-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different type of object after performing copy-paste on an existing object throws error on console] Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/menu/menu-entry.reel/menu-entry.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | adding some error handlingAnanya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | IKNINJA-1754Ananya Sen2012-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| | |\ \ \ \ \
| | * | | | | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the ↵Ananya Sen2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text gets pasted on the stage Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ↵Ananya Sen2012-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is opened Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | - eric gunman's fix for styles-controller - select the appropriate override ↵Ananya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rule to apply the override style Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-13
| | |\ \ \ \ \ \
| | * | | | | | | displace pasted object only if the position is absoluteAnanya Sen2012-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| | |\ \ \ \ \ \ \
| | * | | | | | | | patse raw image data to stageAnanya Sen2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | - removed extra selection change event,Ananya Sen2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - displace element after adding it to the document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | cut/paste for canvas objects and for multiple selected objects of mixed typesAnanya Sen2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | | | | | | cut/paste html elements in single documentAnanya Sen2012-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * |