aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-17
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
| * | | 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
| | * | Sharing app data in banner and html templatesJose Antonio Marquez2012-05-17
| | | | | | | | | | | | | | | | Syncing the files to avoid duplicates and ensure consistency.
| * | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-17
| |\| | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * | Merge pull request #243 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| | |\ \ | | | | | | | | | | Adding default padding for banner templates.
| * | | | 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>
| | * 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
| | |\ | | |/ | |/|
| * | Merge pull request #242 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-17
| |\ \ | | | | | | | | IKNinja-1628 - Can't draw shapes inside canvas after double-clicking into canvas.
| * | | 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 pull request #241 from joseeight/DocumentValerio Virgillito2012-05-16
| | |\ \ \ | | | | | | | | | | | | Adding saving of Montage Components
| | | * \ \ 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>
| | | | | | * Adding default padding for banner templates.Nivesh Rajbhandari2012-05-17
| | | | | |/ | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | | | * 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>
| * | | | 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>
| * \ \ \ \ Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | * \ \ \ \ Merge pull request #240 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-16
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | Automatically add scrollbars if any content is in negative space. Fixed selection bugs in banner templates.
| | | * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-16
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Inline style for html's padding for content in negative space to guarantee ↵Nivesh Rajbhandari2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | highest specificity. Also, set up scrollbars when opening files with content in negative space. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-16
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Fixing selection bugs in new templates.Nivesh Rajbhandari2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | | * | | | Automatically add scrollbars when moving content to negative space.Nivesh Rajbhandari2012-05-16
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | / | | fixing a null value for the document entry barValerio Virgillito2012-05-16
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | changing @change to propertyChangeListenerValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | montage v.0.10 integrationValerio Virgillito2012-05-16
| | |/ / | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | removing first draw on the component eventValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing the menu binding resulting in 1 === true > falseValerio Virgillito2012-05-16
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #238 from joseeight/DocumentValerio Virgillito2012-05-16
| |\ \ | | | | | | | | Fixing Chrome Preview
| | * \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-16
| | |\ \
| | * | | Fixing preview bugJose Antonio Marquez2012-05-16
| | | | | | | | | | | | | | | | | | | | Also setting up for Montage component serialization.
| * | | | adding a null check.Valerio Virgillito2012-05-16
| | |/ / | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | adding data-montage-id to the componentsValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing some of the document bindings.Valerio Virgillito2012-05-16
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing the package file for the new dom templateValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Squashed master into dom-architectureValerio 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 17:59:58 +0000