aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* We don't currently support perspective values on individual elements, so ↵Nivesh Rajbhandari2012-04-26
| | | | | | removing perspective values from the animation presets. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
|\ | | | | Allow users to toggle application of stroke and border settings when using the ink bottle tool. Also, fixed translate tool's handles to draw without stage's zoom.
| * Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\
| * | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge pull request #174 from pushkarjoshi/pentoolValerio Virgillito2012-04-24
|\ \ \ | |_|/ |/| | Pentool
| * | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| |\ \ | |/ / |/| |
* | | Merge pull request #173 from mencio/stage-document-architectureValerio Virgillito2012-04-23
|\ \ \ | | | | | | | | Stage document architecture - Initial commit to support opening Web template
| * \ \ Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ | |/ / / |/| | |
* | | | Fixing the 3d stack for the youtube channel component.Valerio Virgillito2012-04-20
| |_|/ |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Fixing the flow component to layout all the tiles on first draw.Valerio Virgillito2012-04-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge pull request #172 from mayhewinator/WorkingBranchmayhewinator2012-04-20
|\ \ \ | | | | | | | | Revert host permission change from 4/19
| * | | fixed injection caused by inability to add our webRequest listener due to an ↵John Mayhew2012-04-20
| | | | | | | | | | | | | | | | incorrect host permission. Reverting to the old hack fix.
* | | | Merge pull request #170 from mayhewinator/WorkingBranchmayhewinator2012-04-19
|\| | | | | | | | | | | Set the proper host permissions for Ninja in our manifest.json
| * | | Removed hack that required us to use a bogus url for host permissions. ↵John Mayhew2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | Chrome 18 now sends the "Origin" request header if we request host permissions for http://localhost:/ Setting the new and proper host permissions.
* | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-19
|\ \ \ \
| * | | | Merge pull request #169 from mayhewinator/WorkingBranchValerio Virgillito2012-04-19
| |\| | | | | | | | | | | | | Updated Manifest.json for the CRX build
| | * | | Updated Manifest.json for the CRX buildJohn Mayhew2012-04-19
| |/ / /
* | | | Merge branch 'refs/heads/master' into cleanupValerio Virgillito2012-04-19
|\| | |
* | | | cleanup unused code.Valerio Virgillito2012-04-19
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| | | | | | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | more backup fixes for the old stageValerio Virgillito2012-04-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Merge branch 'refs/heads/Document' into stage-document-architectureValerio Virgillito2012-04-19
| | |\ \
| | | * \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-16
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-11
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-10
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-04
| | | |\ \ \ \ \ \
| | | * | | | | | | Backup for mergeJose Antonio Marquez2012-04-04
| | | | | | | | | |
| | | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-02
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Setting up document reworkJose Antonio Marquez2012-04-02
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-28
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-27
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-26
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-21
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-03-14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-09
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | typo fixValerio Virgillito2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | | | | | | initial stage web templateValerio Virgillito2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | | | | | | * re-compute and store the center of the subpath in local coordinates upon ↵Pushkar Joshi2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file open
| | | | | | | | | | | | | | | | | * allow the addition of the pen tool to the timelinePushkar Joshi2012-04-23
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * Merge branch 'master' into pentoolPushkar Joshi2012-04-19
| | | | | | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/helper-classes/3D/view-utils.js
| * | | | | | | | | | | | | | | | | Merge pull request #168 from mqg734/EricMergeValerio Virgillito2012-04-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Merging Eric's snapping and tool fixes into master.
| | * | | | | | | | | | | | | | | | Moving initialzeSnapping routine from RotateObject3DTool tool to ↵Nivesh Rajbhandari2012-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |