aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | 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
| | * | | | | | Reloading local stylesheetsJose Antonio Marquez2012-05-03
| | * | | | | | 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
| | * | | | | | Preliminary Open File (new template)Jose Antonio Marquez2012-05-02
| | * | | | | | More clean up, updating menu itemsJose Antonio Marquez2012-05-01
| | * | | | | | Fixing bindings to new modelJose Antonio Marquez2012-05-01
| | * | | | | | Cleaning up templateJose Antonio Marquez2012-05-01
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Preliminary IO to new DOM viewJose Antonio Marquez2012-05-01
| | * | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-05-01
| | |\ \ \ \ \ \
| | * | | | | | | Setting up new architecture for I/OJose Antonio Marquez2012-05-01