aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-06-25
|\
| * Merge pull request #334 from joseeight/FileIOValerio Virgillito2012-06-25
| |\
| | * Support for browser escaped file paths (CSS)Jose Antonio Marquez2012-06-23
| | * Adding soft resetJose Antonio Marquez2012-06-23
| | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | |\
| | * \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-22
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-21
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-20
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-19
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-15
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge pull request #330 from ericmueller/MaterialBugFixesValerio Virgillito2012-06-25
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | fixed a small startup issue with the RDGE library.hwc4872012-06-22
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #331 from mencio/picasa-fixValerio Virgillito2012-06-22
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | fixing the size of the picasa imagesValerio Virgillito2012-06-22
| * | | | | | | | | | Merge pull request #324 from mqg734/StageGuidesValerio Virgillito2012-06-22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Display "(0, 0)" where the origin is.Nivesh Rajbhandari2012-06-22
| | * | | | | | | | | Have to guard against cases when stage lines are parallel to the canvas and t...Nivesh Rajbhandari2012-06-22
| | * | | | | | | | | IKNINJA-1720 - Object in a document erases 3D grid in other document when swi...Nivesh Rajbhandari2012-06-21
| | * | | | | | | | | Draw stage left and top references lines.Nivesh Rajbhandari2012-06-21
| * | | | | | | | | | Merge pull request #327 from mencio/component-fixesValerio Virgillito2012-06-22
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed issue with Youtube not updating after save and Picasa bacgroundValerio Virgillito2012-06-21
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #320 from ananyasen/cut-copy-pasteValerio Virgillito2012-06-21
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | removed some redundantsAnanya Sen2012-06-21
| | * | | | | | | | 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
| | * | | | | | | | 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
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-20
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | adding some error handlingAnanya Sen2012-06-19
| | * | | | | | | | | | parse html in memory, instead of using a doom elementAnanya Sen2012-06-19
| | * | | | | | | | | | IKNINJA-1754Ananya Sen2012-06-19
| | * | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | start pasting in-place for cut/pasteAnanya Sen2012-06-18
| | * | | | | | | | | | Fixed - IKNINJA-1748 - While pasting text in any text field in the PI, the te...Ananya Sen2012-06-15
| | * | | | | | | | | | Fixed - IKNINJA-1313 - File menu drop down should close when New File dialog ...Ananya Sen2012-06-15
| | * | | | | | | | | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
| | * | | | | | | | | | - eric gunman's fix for styles-controller - select the appropriate override r...Ananya Sen2012-06-13
| | * | | | | | | | | | 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
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | patse raw image data to stageAnanya Sen2012-06-12
| | * | | | | | | | | | | | - removed extra selection change event,Ananya Sen2012-06-11
| | * | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | - fixed multiple paste displacementAnanya Sen2012-06-08
| | * | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | - cleanse html for copying from outer applicationAnanya Sen2012-06-07