| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/AnanyaFileIO' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ | | | | | | | | | | | Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js | ||
| | * | fixed templates descriptor, changed validation to on key up, fixed minor ui ↵ | Ananya Sen | 2012-02-09 |
| | | | | | | | | | | | | | issues Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 |
| |\ \ | | | | | | | | | | | | | Conflicts: index.html | ||
| | * \ | Merge pull request #29 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-02-09 |
| | |\ \ | | | | | | | | | Updates for Splash screen, icon, license page and credits page | ||
| | | * | | removed null characters at the end of this file that made GIT treat it as a ↵ | John Mayhew | 2012-02-09 |
| | | | | | | | | | | | | | | | | | binary file | ||
| | | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-09 |
| | | |\ \ | | |/ / | |/| | | | | | | WorkingBranch | ||
| | | * | | Implemented final splash screen, the credits page and the license page | John Mayhew | 2012-02-09 |
| | | | | | |||
| | | * | | fixed error with initializing and accessing the ninja version object from ↵ | John Mayhew | 2012-02-09 |
| | | | | | | | | | | | | | | | | | the main reel | ||
| | | * | | Updated fav icon to the final image | John Mayhew | 2012-02-09 |
| | | | | | |||
| * | | | | New File | Jose Antonio Marquez | 2012-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 data | Jose Antonio Marquez | 2012-02-09 |
| | | | | |||
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\| | | |||
| | * | | Merge pull request #24 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 |
| | |\ \ | | | | | | | | | Pi bugs | ||
| | | * | | Correcting the PI lock for height which had a bug in the original pull request. | Valerio Virgillito | 2012-02-08 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | Merge branch 'refs/heads/master' into pi_bugs | Valerio Virgillito | 2012-02-08 |
| | | |\ \ | |||
| | | * | | | Fix for the PI Lock button. | Valerio Virgillito | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the following JIRA bugs: 111 Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\| | | | | |||
| | * | | | | Updating the sass file. | Valerio Virgillito | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #27 from ericguzman/TreeComponents | Valerio Virgillito | 2012-02-08 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Tree Components - css fixes | ||
| | | * | | | Tree Components - css fixes | Eric Guzman | 2012-02-08 |
| | |/ / / | |||
| * | | | | Adding a purge library method | Jose Antonio Marquez | 2012-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/FileIO | Jose Antonio Marquez Russo | 2012-02-08 |
| |\ \ \ \ | | | | | | | | | | | Setting up io-mediator to add new functionality. | ||
| | * \ \ \ | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO | Ananya Sen | 2012-02-08 |
| | |\ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: manifest.json | ||
| | * | | | | Merge pull request #25 from mayhewinator/WorkingBranch | mayhewinator | 2012-02-08 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Adding assets required to be a packaged chrome app | ||
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | John Mayhew | 2012-02-08 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | WorkingBranch | ||
| | | * | | | Added manifest.json, and image file required for being a packaged chrome ↵ | John Mayhew | 2012-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 app | Jose Antonio Marquez | 2012-02-08 |
| | | | | | | |||
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: scss/imports/scss/_Stage.scss | ||
| | * | | | | Merge pull request #23 from joseeight/SCSS | Valerio Virgillito | 2012-02-08 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Changing _scss folder to scss | ||
| | | * | | | adding new scss folder | Jose Antonio Marquez | 2012-02-08 |
| | | | | | | |||
| | | * | | | delete _scss directory | Jose Antonio Marquez | 2012-02-08 |
| | |/ / / | |||
| * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 |
| |\| | | | |||
| | * | | | Merge pull request #21 from mencio/pi_bugs | Valerio Virgillito | 2012-02-08 |
| | |\ \ \ | | | | | | | | | | | Pi bugs fixes for 964, 616, 1084 | ||
| | | * | | | IKNINJA - 1084: Fixing the custom tag. | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | IKNINJA-616 - Drag and drop images fix for the PI and source | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | IKNINJA-964 - Fixed inconsistent element name in PI/CSS panel. | Valerio Virgillito | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | Merge pull request #22 from ericguzman/StylesControllerUpdates | Valerio Virgillito | 2012-02-08 |
| | |\ \ \ \ | | |_|/ / | |/| | | | Styles Controller - Added array of dirty stylesheets and event dispatch ... | ||
| | | * | | | Styles Controller - Added array of dirty stylesheets and event dispatch when ↵ | Eric Guzman | 2012-02-08 |
| | | | | | | | | | | | | | | | | | | | | | a sheet is dirtied. | ||
| | * | | | | Merge pull request #20 from mqg734/ToolFixes | Valerio Virgillito | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | Supporting switching materials in the PI. Also, moved makeFillMaterial and ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-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 ToolFixes | Nivesh Rajbhandari | 2012-02-07 |
| | | |\| | | | |||
| | | * | | | | Force layout canvas and SelectionController to update their info when a 2d ↵ | Nivesh Rajbhandari | 2012-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 Rajbhandari | 2012-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 Rajbhandari | 2012-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dropdowns in the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||