aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-01
|\
| * Fixing coreIO API referencingJose Antonio Marquez2012-02-01
| |
| * Applying global button styles to cloud popupJose Antonio Marquez2012-02-01
| |
| * Cloud API Popup FixesJose Antonio Marquez2012-01-31
| | | | | | | | Minor layout fixes, adjusted functionality slightly, need to check into adjusting the file and directory URL constructs for API changes.
| * Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-31
| |\ | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt
| | * Merge pull request #9 from jreid01/pullrequestValerio Virgillito2012-01-31
| | |\ | | | | | | | | Added skin for html buttons.
| | | * Added skin for html buttons.Jon Reid2012-01-31
| | | |
| * | | Hooking cloud popup UI to coreJose Antonio Marquez2012-01-31
| | | | | | | | | | | | | | | | Set up the popup UI for cloud to core API to detected cloud API connection.
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-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 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>
| * | | | Cloud IO PromptJose Antonio Marquez2012-01-31
| | | | | | | | | | | | | | | | | | | | Setting up UI for the file IO prompt on initialization of Ninja and whenever a cloud IO call is made and the server is not detected.
* | | | | fixed reference to coreioapiAnanya Sen2012-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-01-31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: _scss/imports/scss/_Stage.scss js/io/system/coreioapi.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss
| | * | | 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.
| | * | | 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
| | | | |
| * | | | Core API initialization routineJose Antonio Marquez2012-01-30
| | | | | | | | | | | | | | | | | | | | Setting up the core API routine to check for cloud API availability. Also cleaned up template files for IO and set up initial string contents.
| * | | | Setting up new fileJose Antonio Marquez2012-01-30
| | | | | | | | | | | | | | | | | | | | Adding base functionality to creating files.
* | | | | added the api to check if a file is writableAnanya Sen2012-01-31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge branch 'refs/heads/IOWorkflow' into FileIOAnanya Sen2012-01-30
|\ \ \ \ \
| * | | | | calling coreioapi.js directly since filesystem.js will be deletedAnanya Sen2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Moving changes from Gerrit, on 1/27, to the github branch:Ananya Sen2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added file existence check and validation to save as dialog - minor css fix for file picker, new file dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Merge branch 'IOWorkflow' of github.com:ananyasen/ninja-internal into IOWorkflowAnanya Sen2012-01-30
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | | | | | | | | | | | | | | | | | committed initially.
| * | | | | Fixes to radio button base styles. Comment clean-up.Jon Reid2012-01-30
| | |/ / / | |/| | |
* | | | | calling coreioapi.js directly since filesystem.js will be deletedAnanya Sen2012-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | moved fix to open js and css files in code view , from gerrit to githubAnanya Sen2012-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | Merge branch 'FileIO' of github.com:ananyasen/ninja-internal into FileIOAnanya Sen2012-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>
* | | Removing unused file from assets/images. This file should not have been ↵John Mayhew2012-01-30
| | | | | | | | | | | | committed initially.
* | | Fixes to radio button base styles. Comment clean-up.Jon Reid2012-01-30
| |/ |/|
* | Core API clean upJose Antonio Marquez2012-01-29
| | | | | | | | Cleaning up File IO core API and setting up to use URL from welcome screen or local storage. Class will perform an automatic check for IO API to be active, otherwise prompt user.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:31:33 +0000