aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | * | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ \ \ \ \ \
| | | * | | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | | | | | | | |
| | | * | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| | |\| | | | |
| | * | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Updating id to data-montage-id.
| | | * | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | Fixing body's default styles.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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | Merge pull request #193 from joseeight/DocumentValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | New Document View
| | * | | | | | Clean up, ready for alpha check-inJose Antonio Marquez2012-05-03
| | | | | | | |
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-03
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Full CSS support on openJose Antonio Marquez2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened.
| | * | | | | | Reloading local stylesheetsJose Antonio Marquez2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the reload method of local linked styles, still need to parse style contents for URLs and also add cross-domain stylesheet support.
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-02
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Adding hack to allow for blank documents to openJose Antonio Marquez2012-05-02
| | | | | | | |
| | * | | | | | Switching DOM Mutation Events to HTML5Jose Antonio Marquez2012-05-02
| | | | | | | |
| | * | | | | | Partial URL parsingJose Antonio Marquez2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added temporary URL parsing to document assets. (head and body)
| | * | | | | | Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic open file functionality, does not parse document for URLs.