aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-18
|\
| * Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-18
| |\ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * 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
| | |\
| | * \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-18
| | |\ \
| | * \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-17
| | |\ \ \
| | * | | | Adding component initialization on openJose Antonio Marquez2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | This is for opening components, selection is still not reflecting component data.
| | * | | | fixing the breadcrumbValerio Virgillito2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fixing the color chip for the document rootValerio Virgillito2012-05-18
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing a scrolling issue when multiple documents are switchedValerio Virgillito2012-05-18
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | 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
| | * | 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
| | | | * Sharing app data in banner and html templatesJose Antonio Marquez2012-05-17
| | | | | | | | | | | | | | | | | | | | Syncing the files to avoid duplicates and ensure consistency.
| | * | | 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>
| * | | 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 'dom-architecture' of ↵Valerio Virgillito2012-05-17
| |\| | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * Fixed chrome preview for banner templates.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
| | |\
| | * | Adding default padding for banner templates.Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | fixing the breadcrumbValerio Virgillito2012-05-17
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #242 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\| | | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into canvas.
| | * IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵Nivesh Rajbhandari2012-05-17
| | | | | | | | | | | | | | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | integrated open code view document in new dom architectureAnanya Sen2012-05-18
|/ / | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Adding a disabled property to the label-checkbox.Valerio Virgillito2012-05-17
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | document controller and stage view code cleanupValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | code cleanup and refactoring of the document controller and stage viewValerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | clearing the needs save flag on save.Valerio Virgillito2012-05-16
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
|\ \ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| |\|
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| |\ \
| * | | Fixing serialization referencing (new object per save)Jose Antonio Marquez2012-05-16
| | | |
| * | | Fixing reference to serialization tagJose Antonio Marquez2012-05-16
| | | |
| * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| |\ \ \
| * | | | Adding basic montage components I/OJose Antonio Marquez2012-05-16
| | | | | | | | | | | | | | | | | | | | Only for saving basic components without a reel.
* | | | | Timeline should not select an element when a layer is selected by code.Valerio Virgillito2012-05-16
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixed bug with keyboard shortcut for fill/ink toolJohn Mayhew2012-05-16
| | | | |
| * | | | -added new images for the text tool optionsJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images
| * | | | updated object 3D options bar to use the new radio stylesJohn Mayhew2012-05-15
| | | | | | | | | | | | | | | | | | | | removed its use of the sprite sheet
| * | | | Add color to tag toolValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-05-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | WorkingBranch