aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2 from mqg734/NiveshColorJose Antonio Marquez Russo2012-02-01
|\ | | | | Updated PI color code to go through mediator. Also enabled getting/setting color support for shapes.
| * Updated color code in the PI to go through element mediator.Nivesh Rajbhandari2012-02-01
| | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-01
|\ \
| * \ Merge pull request #9 from jreid01/pullrequestValerio Virgillito2012-01-31
| |\ \ | | | | | | | | Added skin for html buttons.
| | * | Added skin for html buttons.Jon Reid2012-01-31
| | | |
* | | | Merge pull request #1 from mqg734/NiveshColorJose Antonio Marquez Russo2012-01-31
|\ \ \ \ | | |_|/ | |/| | Updated color code to handle shapes.
| * | | 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
| |\ \ \ | |/ / / |/| / / | |/ /
* | | IKNINJA-1083Jose Antonio Marquez2012-01-30
| | | | | | | | | | | | Fixing minor bug with no color breaking on null alpha value.
| * | 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
| |/ / |/| | | | | | | | | | | | | | | | | 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>
| * | 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>
* | Merge pull request #4 from ericguzman/CSSPanelUpdatesValerio Virgillito2012-01-30
|\ \ | | | | | | CSSPanel Updates - Add new original CSS error icon
| * | CSSPanel Updates - Add new original CSS error iconEric Guzman2012-01-30
| | |
* | | Merge pull request #3 from mayhewinator/mastermayhewinator2012-01-30
|\ \ \ | |/ / |/| / | |/ Code cleanup. Removing unnecessary Thumbs.db file from our assets folder.
| * Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | committed initially.
* | Merge pull request #2 from jreid01/pullrequestValerio Virgillito2012-01-27
|\ \ | |/ |/| Fixes to radio button base styles. Comment clean-up.
| * Fixes to radio button base styles. Comment clean-up.Jon Reid2012-01-27
| |
* | Merge pull request #1 from mqg734/ToolFixesValerio Virgillito2012-01-27
|\ \ | |/ |/| Fixed canvas width/height bug.
| * Updated canvas controller to override setProperties so we don't set styles ↵Nivesh Rajbhandari2012-01-27
|/ | | | | | when updating width and height. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Adding excluded list of files to gitignore and removed cloud/config.xml file.Valerio Virgillito2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
| | | | Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>
* first commitPierre Frisch2011-12-22
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 08:46:40 +0000