aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | 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
| |\ \ \ \
| * | | | | Update PI when element is changed by one of the tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing keyboard shortcut and tooltip for hand and 3d tools.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge pull request #14 from mencio/IKNINJA-854Valerio Virgillito2012-02-06
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | IKNINJA-854 - removed cons and replaced it with var
| * | | | | IKNINJA-854 - removed cons and replaced it with varValerio Virgillito2012-02-03
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | / / / 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>
* | | | 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.
| * | | | | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Adding legal attribution for decompose matrix routine.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Updating Shapes PI to support corner radii. Also fixed PI bug where we were ↵Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always updating custom section 0. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing 3d section of the PI.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Support stage in PI's 3d section.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merging Jose's colorchip change.Nivesh Rajbhandari2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Adding browser check for Chrome and redirect page.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | | Code cleanup - Removed extra log.Valerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | | Adding a version json object to NinjaValerio Virgillito2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions object to start keeping track of versions for Ninja, Montage and eventually other dependencies. Loaded before montage to use in the splash screen. Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
| * | | | | Removed unused images and reduced the size of the larger image files used ↵John Mayhew2012-01-31
| | | | | | | | | | | | | | | | | | | | | | | | for shaders.
| * | | | | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | | | | |
| * | | | | Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | committed initially.
| * | | | | Forgot to remove a require in previous checkin.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Removing unused Properties3D file since those values are now saved with the ↵Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | models. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixed issue with elements not drawing in the correct plane.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first adding an element, force the 3d model to update with the element's webkit transform values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixed grid not drawing bug when switching from front to top and side.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| | | | | |