aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-06
|\
| * updating the versions file after the montage integration. Bumped ninja ↵Valerio Virgillito2012-02-03
| | | | | | | | | | | | version to 0.5.5 in preparation to a stable build. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | We were only updating the first custom section in the PI.Nivesh Rajbhandari2012-02-03
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Update element planes after shapes are created so stage grid updates.Nivesh Rajbhandari2012-02-03
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NiveshColor' into ToolFixesNivesh Rajbhandari2012-02-03
|\ \ | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Removed border special-casing from PI since the mediator now handles this ↵Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | | | | | | | generically. Updated mediator's set stroke routine to use the setColor routine. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Updated color code to handle shapes.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Merge branch 'refs/heads/Jose-Color' into NiveshColorNivesh Rajbhandari2012-01-31
| |\ \
* | \ \ Merge branch 'refs/heads/master' into ToolFixesNivesh Rajbhandari2012-02-03
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'montage-integration' into stagingValerio Virgillito2012-02-02
| |\ \ \
| | * \ \ Merge pull request #11 from joseeight/MontageV6ColorValerio Virgillito2012-02-02
| | |\ \ \ | | | | | | | | | | | | Fixed the color popups to work with m-js v6
| | | * | | Fixed the color popups to work with m-js v6Jose Antonio Marquez2012-02-02
| | |/ / / | | | | | | | | | | | | | | | Removed the wrapper DIV, now it's more direct to create and insert the content in the popups. Changes created DOM exceptions, so it had to be modified.
| | * | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Fixes for montage integrationValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | removing references to the old components in the app delegateValerio Virgillito2012-02-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | upgrading to Montage v0.6Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Revert "Adding njUtils as a component and adding it to the application object"Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f07bbfaa60c3fb7c2412c5aa97b49d114d6a88ea. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fixes for montage integrationValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Adding njUtils as a component and adding it to the application objectValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | removing references to the old components in the app delegateValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-02-02
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | IKNINJA-1083Jose Antonio Marquez2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| | * | | | Added skin for html buttons.Jon Reid2012-02-02
| | | | | |
| | * | | | Fixing the bread-crumb backgroundValerio Virgillito2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge pull request #12 from mqg734/ToolFixesValerio Virgillito2012-02-02
| |\ \ \ \ \ | | | | | | | | | | | | | | Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
| * \ \ \ \ \ Merge branch 'pullrequest' of github.com:jreid01/ninja-internal into stagingValerio Virgillito2012-02-02
| |\ \ \ \ \ \
| | * | | | | | Delete unneeded compass log file (IKNINJA 1101).Jon Reid2012-02-01
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Update base styles for better colors on HTML buttons. Change project panel so it shows no project by default.
| * | | | | | Merge branch 'refs/heads/master' into stagingValerio Virgillito2012-02-02
| |\| | | | |
| | * | | | | IKNINJA-1083Jose Antonio Marquez2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| | * | | | | Merge pull request #9 from jreid01/pullrequestValerio Virgillito2012-01-31
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | Added skin for html buttons.
| | | * | | | Added skin for html buttons.Jon Reid2012-01-31
| | | | | | |
| | * | | | | Fixing the bread-crumb backgroundValerio Virgillito2012-01-31
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CSS cleanup added a background to the bottom panel container which broke the bread-crumb background. Fixing by adding the background directly to the bread-crumb component. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | / / Checkbox and Combobox change/changing events were not setting wasSetByCode ↵Nivesh Rajbhandari2012-02-01
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | property correctly, causing our PI to dispatch events at improper times. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-01-30
| | |\ \ \
| | | * \ \ Merge pull request #7 from mayhewinator/WorkingBranchmayhewinator2012-01-30
| | | |\ \ \ | | | | | | | | | | | | | | Removed unused images and reduced the size of the larger image files
| | | | * | | Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for shaders.
| | * | | | | Merge branch 'core' of https://github.com/mencio/ninja-internal into mencio-coreValerio Virgillito2012-01-30
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: index.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | Adding browser check for Chrome and redirect page.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a check for Google Chrome browser and a redirect page to download and install Chrome. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | Adding the version to the main Ninja reel component.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | | * | | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| | | * | | | Adding a version json object to NinjaValerio Virgillito2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |<