Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| * | | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ... | Nivesh Rajbhandari | 2012-03-27 |
| * | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| |\ \ \ \ | |||
| * | | | | | Tweaking some styles in the materials popup. | Nivesh Rajbhandari | 2012-03-23 |
* | | | | | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working" | Jon Reid | 2012-04-05 |
* | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-04-04 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-30 |
|\| | | | | |||
| * | | | | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| | |\ \ \ \ \ | |||
| | * | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | * | | | | | | Merge branch 'pentool' into brushtool | Pushkar Joshi | 2012-03-13 |
| | |\ \ \ \ \ \ | |||
| | * | | | | | | | Add a smoothing amount parameter, and hide options based on checkboxes | Pushkar Joshi | 2012-03-13 |
| | * | | | | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-12 |
| | |\ \ \ \ \ \ \ | |||
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-29 |
|\| | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| | * | | | | | | | | fixed logical error in triggering menu item | Ananya Sen | 2012-03-26 |
| | * | | | | | | | | - removed menu-data boundObj path support for now | Ananya Sen | 2012-03-22 |
| | * | | | | | | | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while rendering | Ananya Sen | 2012-03-22 |
| | * | | | | | | | | file picker - added size unit | Ananya Sen | 2012-03-22 |
| | * | | | | | | | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on windo... | Ananya Sen | 2012-03-22 |
| | * | | | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-03-22 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| * | | | | | | | | Merge pull request #139 from dhg637/ResizersRefactoring | Valerio Virgillito | 2012-03-28 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | |