Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-23 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | - Decouple code editor from stage document switching logic | Ananya Sen | 2012-04-09 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | 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 Components | Jose Antonio Marquez | 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 | |
| |/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | more work on making subtool styling/layout consistent | John Mayhew | 2012-05-07 | |
* | | | | | | | | | | | | | | More implementation of moving color chips to the individual subtools. | John Mayhew | 2012-05-07 | |
* | | | | | | | | | | | | | | First round of moving color chips into the sub tools. Shape and Pen tool now ... | John Mayhew | 2012-05-03 | |
|/ / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge cleanup | Valerio Virgillito | 2012-04-27 | |
* | | | | | | | | | | | | | Merge branch 'refs/heads/serialization' | Valerio Virgillito | 2012-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja... | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 | |
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | ||||
| * / | | | | | | | | | | | | Removing all "module" declarations and replaced with "prototype" in preparati... | John Mayhew | 2012-04-26 | |
| |/ / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-26 | |
|\| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge pull request #175 from mqg734/BoundsCalculation | Valerio Virgillito | 2012-04-25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Allow users to toggle application of stroke and border settings when using th... | Nivesh Rajbhandari | 2012-04-24 | |
| | * | | | | | | | | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos i... | Nivesh Rajbhandari | 2012-04-20 | |
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-25 | |
|\| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-03 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | render the pen path with local coordinates, but use stage world coordinates t... | Pushkar Joshi | 2012-04-02 | |
* | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-23 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 | |
| * | | | | | | | | | | | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| * | | | | | | | | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Breadcrumb Fix | Kruti Shah | 2012-04-20 | |
* | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||
| * | | | | | | | | | | | cleanup unused code. | Valerio Virgillito | 2012-04-19 | |
| |/ / / / / / / / / / | ||||
* | | | | | | | | | | | BreadCrumb Bug Fix | Kruti Shah | 2012-04-19 | |
* | | | | | | | | | | | Timeline: Bug fix: problem with editing layers missing last letter in new | Jon Reid | 2012-04-13 | |
* | | | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-04-10 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should not | Jon Reid | 2012-04-09 | |
* | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / |