Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-18 |
|\ | |||
| * | Merge pull request #246 from joseeight/Document | Valerio Virgillito | 2012-05-18 |
| |\ | | | | | | | Fixing Save Logic | ||
* | | | Clean up and adding TODOs | Jose Antonio Marquez | 2012-05-18 |
| |/ |/| | |||
* | | Fixing save logic | Jose Antonio Marquez | 2012-05-18 |
| | | | | | | | | Moved dirty marker clearing code to model. | ||
* | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-18 |
|\| | |||
| * | fixing a scrolling issue when multiple documents are switched | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-18 |
|\| | |||
| * | fixed a switch documents bug where the layout was getting called before ↵ | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Fixing the save as paths | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixed the shape subtool not refreshing the icon | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixing some snapping bugs | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | enabling basic document switching | Valerio Virgillito | 2012-05-18 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | fixed the draw util doc root reference | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-17 |
| |\ | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * | | removing all stageDeps for drawing classes. | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | multiple documents - enable opening multiple documents and initial switching | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-17 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge pull request #245 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-17 |
| |\ \ | | | | | | | | | Fixed border radius hot-text linking that was broken by update to montage v.10. | ||
| | * | | Removed unneeded identifier. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #244 from joseeight/Document | Valerio Virgillito | 2012-05-17 |
| |\ \ \ | | |_|/ | |/| | | Cleaning up files for templates | ||
| * | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-17 |
| |\ \ \ | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * | | | | fixing the breadcrumb | Valerio Virgillito | 2012-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 Rajbhandari | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | | Adding component initialization on open | Jose Antonio Marquez | 2012-05-17 |
| | | | | | | | | | | | | | | | | | | | | This is for opening components, selection is still not reflecting component data. | ||
* | | | | | fixing the breadcrumb | Valerio Virgillito | 2012-05-17 |
| |_|/ / |/| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | | Sharing app data in banner and html templates | Jose Antonio Marquez | 2012-05-17 |
| |/ / |/| | | | | | | | | Syncing the files to avoid duplicates and ensure consistency. | ||
* | | | Merge pull request #243 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-17 |
|\ \ \ | |/ / |/| / | |/ | Adding default padding for banner templates. | ||
| * | Fixed chrome preview for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-17 |
| |\ | |/ |/| | |||
* | | Merge pull request #242 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-17 |
|\ \ | | | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into canvas. | ||
* | | | Adding a disabled property to the label-checkbox. | Valerio Virgillito | 2012-05-17 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | document controller and stage view code cleanup | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | code cleanup and refactoring of the document controller and stage view | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | clearing the needs save flag on save. | Valerio Virgillito | 2012-05-16 |
| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-16 |
|\ \ \ | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | ||
| * \ \ | Merge pull request #241 from joseeight/Document | Valerio Virgillito | 2012-05-16 |
| |\ \ \ | | | | | | | | | | | Adding saving of Montage Components | ||
| | * \ \ | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | |\ \ \ | |||
| | * | | | | Fixing serialization referencing (new object per save) | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | |||
| | * | | | | Fixing reference to serialization tag | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | |||
| | * | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-16 |
| | |\ \ \ \ | |||
| | * | | | | | Adding basic montage components I/O | Jose Antonio Marquez | 2012-05-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only for saving basic components without a reel. | ||
* | | | | | | | Timeline should not select an element when a layer is selected by code. | Valerio Virgillito | 2012-05-16 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | Adding default padding for banner templates. | Nivesh Rajbhandari | 2012-05-17 |
| | | | |/ | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | | * | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into ↵ | Nivesh Rajbhandari | 2012-05-17 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-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> | ||
| * \ \ \ | Merge pull request #239 from mayhewinator/WorkingBranch | Valerio Virgillito | 2012-05-16 |
| |\ \ \ \ | | | | | | | | | | | | | Tool Options styling and Icon update | ||
| | * | | | | fixed bug with keyboard shortcut for fill/ink tool | John Mayhew | 2012-05-16 |
| | | | | | | |||
| | * | | | | -added new images for the text tool options | John Mayhew | 2012-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -simplified text options CSS -fixed styling to accommodate new images |