aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| | | * | | 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>
| | * | | | | | | 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 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
| | | * \ \ Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | | | * \ \ Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-15
| | | | |\ \ \
| | | | * | | | Adding special preview for templatesJose Antonio Marquez2012-05-15
| | | | | | | |
| | | * | | | | fixed some binding warningsValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | document close handler. initial working draftValerio Virgillito2012-05-15
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | fixed the mouse wheel scrollValerio Virgillito2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | Merge branch 'dom-architecture' of ↵Valerio Virgillito2012-05-15
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture
| | | | * | | Correcting location of Ninja meta dataJose Antonio Marquez2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs to be inside most child div.
| | | | * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-15
| | | | |\ \ \
| | | | | * \ \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-15
| | | | | |\ \ \
| | | | | * | | | Fixing scrollbar syncing, including pan tool, for banner templates.Nivesh Rajbhandari2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | |