aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* New FileJose Antonio Marquez2012-02-09
| | | | Adding new file functionality, awaiting UI to implement correct file path for templates to hook into mediator.
* Fixing URI for templates, need UI to use correct dataJose Antonio Marquez2012-02-09
|
* Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\
| * Merge pull request #24 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ | | | | | | Pi bugs
| | * Correcting the PI lock for height which had a bug in the original pull request.Valerio Virgillito2012-02-08
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge branch 'refs/heads/master' into pi_bugsValerio Virgillito2012-02-08
| | |\
| | * | Fix for the PI Lock button.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | |
| * | | Updating the sass file.Valerio Virgillito2012-02-08
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge pull request #27 from ericguzman/TreeComponentsValerio Virgillito2012-02-08
| |\ \ \ | | | | | | | | | | Tree Components - css fixes
| | * | | Tree Components - css fixesEric Guzman2012-02-08
| |/ / /
* | | | Adding a purge library methodJose Antonio Marquez2012-02-08
| | | | | | | | | | | | | | | | Added a delete libraries function to delete all libraries in Chrome sandbox (as in a force delete). Also updated descriptor files to go with new directory layout of files and relation to the relatives paths used by the packed app and it's manifest.
* | | | Merge pull request #3 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-08
|\ \ \ \ | | | | | | | | | | Setting up io-mediator to add new functionality.
| * \ \ \ Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: manifest.json
| * | | | Merge pull request #25 from mayhewinator/WorkingBranchmayhewinator2012-02-08
| |\ \ \ \ | | |_|_|/ | |/| | | Adding assets required to be a packaged chrome app
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-08
| | |\ \ \ | | |/ / / | |/| | | | | | | | WorkingBranch
| | * | | Added manifest.json, and image file required for being a packaged chrome ↵John Mayhew2012-02-08
| | | | | | | | | | | | | | | | | | | | application. Removed the old versions.json and updated the main page to detect if it is running as a chrome app and retrieve the version info from the chrome.app object. If the app is running hosted, the code will use an XHR to load the manifest.json and retrieve the version number from it directly.
* | | | | Setting up packaged appJose Antonio Marquez2012-02-08
| | | | |
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scss/imports/scss/_Stage.scss
| * | | | Merge pull request #23 from joseeight/SCSSValerio Virgillito2012-02-08
| |\ \ \ \ | | |_|_|/ | |/| | | Changing _scss folder to scss
| | * | | adding new scss folderJose Antonio Marquez2012-02-08
| | | | |
| | * | | delete _scss directoryJose Antonio Marquez2012-02-08
| |/ / /
* | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
|\| | |
| * | | Merge pull request #21 from mencio/pi_bugsValerio Virgillito2012-02-08
| |\ \ \ | | | | | | | | | | Pi bugs fixes for 964, 616, 1084
| | * | | IKNINJA - 1084: Fixing the custom tag.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | IKNINJA-616 - Drag and drop images fix for the PI and sourceValerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel.Valerio Virgillito2012-02-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge pull request #22 from ericguzman/StylesControllerUpdatesValerio Virgillito2012-02-08
| |\ \ \ \ | | |_|/ / | |/| | | Styles Controller - Added array of dirty stylesheets and event dispatch ...
| | * | | Styles Controller - Added array of dirty stylesheets and event dispatch when ↵Eric Guzman2012-02-08
| | | | | | | | | | | | | | | | | | | | a sheet is dirtied.
| * | | | Merge pull request #20 from mqg734/ToolFixesValerio Virgillito2012-02-08
| |\ \ \ \ | | | | | | | | | | | | Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
| | * | | | Added ability to toggle combobox's visibility so we can show/hide materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comboboxes in the tool options. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | id's must start with a letter, so our workaround for using uuid for RDGE ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas id's won't work because they often start with a number. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Fixing some typos and undeclared variables in GLRectangle and ShapesController.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makeStrokeMaterial functions into GLGeomObj so shapes other than GLRectangle can use these routines. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Fixed PI to support WebGL materials.Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Updated tools and PI to get/set materials by binding to appModel's materials ↵Nivesh Rajbhandari2012-02-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-07
| | |\| | |
| | * | | | Force layout canvas and SelectionController to update their info when a 2d ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | canvas is replaced by a 3d canvas (and vice-versa). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Support toggling between 2d and 3d canvas context. This requires us to ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create a new canvas with all the same values as the canvas being replaced and copying over all the shape data. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Add enabled property for ComboBox to support enabling/disabling materials ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Allow users to switch between 2d and webGL mode. Note that this doesn't ↵Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | Support use WebGL checkbox in the PI.Nivesh Rajbhandari2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Fixed data type issue on copying library filesJose Antonio Marquez2012-02-08
| | | | | | | | | | | | | | | | | | | | | | | | Fixed the methods to allow for ArrayBuffer data to be sent, fixes saving files that are not plain text.
* | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | | | |
| * | | | | updated montage v.0.6 to the latest changes.Valerio Virgillito2012-02-07
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Mime type fixesJose Antonio Marquez2012-02-07
| | | | | | | | | | | | | | | | | | | | Trying to fix mime type issues in FileSystem, Chrome does not support reponseType 'blob', so looking at alternatives.
* | | | | Copy local library to cloudJose Antonio Marquez2012-02-07
| | | | | | | | | | | | | | | | | | | | Adding functionality to copy a local library to the cloud. Currently creating directory structure. Need to add ability to copy files and ensure proper mime-type is set.
* | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-07
|\| | | |
| * | | | Merge pull request #19 from ericguzman/TreeComponentsValerio Virgillito2012-02-07
| |\ \ \ \ | | |_|/ / | |/| | | Tree Components - Added copyright comments
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:53:39 +0000