aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | * | | | | | | | Moving webGL to own helper classJose Antonio Marquez2012-05-07
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaning up webGL for better working files.
| * | | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Extracting CSS methods to parsing class.Jose Antonio Marquez2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to do the same with webGL.
| | * | | | | | | Adding back currentView property in document-html so that menus work.Nivesh Rajbhandari2012-05-07
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | Merge pull request #196 from joseeight/DocumentValerio Virgillito2012-05-07
|\| | | | | | | | | | | | | | | | | | | | | | | Adding webGL for open file.
| * | | | | | | Adding webGL support for opening filesJose Antonio Marquez2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added I/O for loading webGL on open file. I/O support for saving to come.
| * | | | | | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #195 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-04
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes for 3d, selection, and keyboard shortcuts
| * | | | | | | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-04
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | reverting to v0.8 flow component for the picasa carouselValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Fixing the color popupValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | fixing the currentContainerValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | code cleanupValerio Virgillito2012-05-02
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | integrating the latest montage versionValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Removing unused components referencesValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #190 from ananyasen/master-data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | use data-montage-id instead of id in template
| | * | | | | | | | |