aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-07
|\
| * Merge pull request #195 from mqg734/Dom-ArchitectureValerio Virgillito2012-05-04
| |\
| | * Temporarily skipping activeDocument.currentView check so keyboard shortcuts s...Nivesh Rajbhandari2012-05-04
| | * Fixing references to iframe's styles in new template.Nivesh Rajbhandari2012-05-04
| | * Draw 3d grid by default since app model is not hooked up yet.Nivesh Rajbhandari2012-05-04
| | * 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
| | * | Fixing the color popupValerio Virgillito2012-05-04
| | * | Fixing the tools list separators and document bar disabled stateValerio Virgillito2012-05-04
| | * | temporary commenting a timeline bug preventing nested selectionValerio Virgillito2012-05-04
| | * | fixing the currentContainerValerio Virgillito2012-05-03
| | * | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ \
| | | * \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \ \
| | | * | | | Refactor creating elements. Removed makeNJElement and separated the model cre...Valerio Virgillito2012-05-03
| | | * | | | Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
| | | |\ \ \ \
| | | * | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el...Valerio Virgillito2012-05-02
| | | * | | | | code cleanupValerio Virgillito2012-05-02
| | * | | | | | integrating the latest montage versionValerio Virgillito2012-05-03
| | * | | | | | Removing unused components referencesValerio Virgillito2012-05-03
| | * | | | | | Fixing the lock button cssValerio Virgillito2012-05-03
| | * | | | | | finishing to replace all id with data-montage-idValerio Virgillito2012-05-03
| | * | | | | | Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | * | | | | | 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 templateAnanya Sen2012-05-03
| | |/ / / / / / /
| | * | | | | | | 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 (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
| | * | | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| | |/ / / / / / /
| | * | | | | | | converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | | | | | | | * Fixing body's default styles.Nivesh Rajbhandari2012-05-04
| | | | | | | | * Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-04
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #193 from joseeight/DocumentValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | | | | | | | * Removed special-casing for new template workflow. Instead, we will enforce a...Nivesh Rajbhandari2012-05-04
| | | | | | | | * Fixing selection and layout code to exclude SCRIPT and STYLE tags.Nivesh Rajbhandari2012-05-04
| | | | | | | |/ | | | | | | |/|
* | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-04
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Code reformattingValerio Virgillito2012-05-03
| * | | | | | | Merge pull request #192 from ananyasen/Codeview-improvementsValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | using prototype in the serializationAnanya Sen2012-05-03
| | * | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| | |\| | | | |
| | * | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | * | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-02
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | removing format button for now until fully implementedAnanya Sen2012-05-02
| | * | | | | | disable format button for nowAnanya Sen2012-05-01