aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-22
|\ | | | | | | | | Conflicts: js/document/document-html.js
| * fixing a few document switching issues.Valerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * - fixed save asAnanya Sen2012-05-21
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-21
| |\
| * | - added opening multiple code and design view documentsAnanya Sen2012-05-21
| | | | | | | | | | | | | | | | | | | | | - switching between multiple code and design view documents - Note: closing of documents, when multiple documents are open, is not yet implemented Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | use documents parent container propertyAnanya Sen2012-05-20
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | save for code view documents in the new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
| |\ \
| * | | integrated open code view document in new dom architectureAnanya Sen2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | Bumping RDGE version numberJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | This is to ensure there are no conflicts with older working files.
* | | | Maintain I/O webGL mode fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | Keeping data in-file if a data tag is detected.
* | | | Minor bug fixJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | No longer using webgl attribute names, instead using canvas to be more consistent and allow for better term usage across canvas 2D and RDGE.
* | | | Adding support for reading webgl external filesJose Antonio Marquez2012-05-22
| | | | | | | | | | | | | | | | For author-time, run-time is already checked in and supported.
* | | | Fixing localization bug with webgl external dataJose Antonio Marquez2012-05-21
| | | |
* | | | Modifying Canvas Data I/OJose Antonio Marquez2012-05-21
| | | | | | | | | | | | | | | | Changing methods to save all data to external files, this will be optional for the user. Currently save will only save to external files, but UI will allow user to save in file. Need to implement loading data on file open for external file, only works for in file currently. Modified the Runtime file to load all data itself to not bulk up the user document.
* | | | Adding mappings to Google ComponentsJose Antonio Marquez2012-05-21
| | | | | | | | | | | | | | | | This is just to add correct mappings to Google Montage components in the package.json file generated.
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-21
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #247 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-18
| |\ \ \ | | |_|/ | |/| | Fixing button and radio controls in the Properties Panel and repetition and file-chooser control in the Materials Panel.
| | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-18
| |\ \ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | | fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixing button controls in the Properties Panel for changes in montage v.10 ↵Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawing. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #246 from joseeight/DocumentValerio Virgillito2012-05-18
| |\ \ \ \ | | |/ / / | |/| | | Fixing Save Logic
* | | | | Clean up and adding TODOsJose Antonio Marquez2012-05-18
| |/ / / |/| | |
* | | | Fixing save logicJose Antonio Marquez2012-05-18
| | | | | | | | | | | | | | | | Moved dirty marker clearing code to model.
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-18
|\| | |
| * | | fixing a scrolling issue when multiple documents are switchedValerio Virgillito2012-05-18
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-18
|\| |
| * | fixed a switch documents bug where the layout was getting called before ↵Valerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing the save as pathsValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixed the shape subtool not refreshing the iconValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing some snapping bugsValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | enabling basic document switchingValerio Virgillito2012-05-18
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixed the draw util doc root referenceValerio Virgillito2012-05-17
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-17
| |\ \ | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | removing all stageDeps for drawing classes.Valerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | multiple documents - enable opening multiple documents and initial switchingValerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #245 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\ \ \ | | | | | | | | | | Fixed border radius hot-text linking that was broken by update to montage v.10.
| | * | | Removed unneeded identifier.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-17
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #244 from joseeight/DocumentValerio Virgillito2012-05-17
| |\ \ \ \ | | |_|/ / | |/| | | Cleaning up files for templates
| * | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | | | | fixing the breadcrumbValerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | Fixed border radius hot-text linking that was broken by update to montage v.10.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Adding component initialization on openJose Antonio Marquez2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | This is for opening components, selection is still not reflecting component data.