| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-07 |
| |\ | |||
| | * | Merge pull request #195 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-04 |
| | |\ | |||
| | | * | Temporarily skipping activeDocument.currentView check so keyboard shortcuts s... | Nivesh Rajbhandari | 2012-05-04 |
| | | * | Fixing references to iframe's styles in new template. | Nivesh Rajbhandari | 2012-05-04 |
| | | * | Draw 3d grid by default since app model is not hooked up yet. | Nivesh Rajbhandari | 2012-05-04 |
| | | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
| | | |\ | | |/ | |/| | |||
| | * | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 |
| | |\ \ | |||
| | | * | | reverting to v0.8 flow component for the picasa carousel | Valerio Virgillito | 2012-05-04 |
| | | * | | Fixing the color popup | Valerio Virgillito | 2012-05-04 |
| | | * | | Fixing the tools list separators and document bar disabled state | Valerio Virgillito | 2012-05-04 |
| | | * | | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 |
| | | * | | fixing the currentContainer | Valerio Virgillito | 2012-05-03 |
| | | * | | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 |
| | | |\ \ | |||
| | | | * \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | | |\ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | | |\ \ \ | |||
| | | | * | | | | Refactor creating elements. Removed makeNJElement and separated the model cre... | Valerio Virgillito | 2012-05-03 |
| | | | * | | | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 |
| | | | |\ \ \ \ | |||
| | | | * | | | | | Nesting absolute element in the Tag tool. Refactoring element creation and el... | Valerio Virgillito | 2012-05-02 |
| | | | * | | | | | code cleanup | Valerio Virgillito | 2012-05-02 |
| | | * | | | | | | integrating the latest montage version | Valerio Virgillito | 2012-05-03 |
| | | * | | | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 |
| | | * | | | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 |
| | | * | | | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 |
| | | * | | | | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 |
| | | * | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| | | |\ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge pull request #190 from ananyasen/master-data-id | Valerio Virgillito | 2012-05-03 |
| | | |\ \ \ \ \ \ \ | |||
| | | | * | | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | |/ / / / / / / | |||
| | | * | | | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 |
| | | |\ \ \ \ \ \ \ | |||
| | | | * | | | | | | | Changing ID to Montage-ID for Color Panel | Jose Antonio Marquez | 2012-05-03 |
| | | | * | | | | | | | Changing ID to Montage-ID for Color Components | Jose Antonio Marquez | 2012-05-03 |
| | | | | |_|_|/ / / | | | |/| | | | | | |||
| | | * | | | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 |
| | | |\| | | | | | | |||
| | | * | | | | | | | Merge pull request #183 from mqg734/data-id | Valerio Virgillito | 2012-04-30 |
| | | |\ \ \ \ \ \ \ | |||
| | | | * | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ... | Nivesh Rajbhandari | 2012-04-30 |
| | | * | | | | | | | | fixing the menu and tool properties | Valerio Virgillito | 2012-04-30 |
| | | |/ / / / / / / | |||
| | | * | | | | | | | converting the layout folder to use data-montage-id | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | * | Fixing body's default styles. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #193 from joseeight/Document | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| | | | | | | | | * | Removed special-casing for new template workflow. Instead, we will enforce a... | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | * | Fixing selection and layout code to exclude SCRIPT and STYLE tags. | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | |/ | | | | | | |/| | |||
| * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-04 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| | * | | | | | | | Code reformatting | Valerio Virgillito | 2012-05-03 |
| | * | | | | | | | Merge pull request #192 from ananyasen/Codeview-improvements | Valerio Virgillito | 2012-05-03 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| | | * | | | | | | using prototype in the serialization | Ananya Sen | 2012-05-03 |
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 |
| | | |\| | | | | | |||
| | | * | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-05-03 |
| | | * | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-02 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | | removing format button for now until fully implemented | Ananya Sen | 2012-05-02 |
| | | * | | | | | | disable format button for now | Ananya Sen | 2012-05-01 |