| Commit message (Expand) | Author | Age |
* | 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 |
| |\ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| | * | | | | | | | Resizers updated | Armen Kesablyan | 2012-03-23 |
| | |/ / / / / / |
|
| * | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBox | Valerio Virgillito | 2012-03-22 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | Adding enabled/disabled support for PI's checkbox control. | Nivesh Rajbhandari | 2012-03-22 |
| | * | | | | | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| * | | | | | | | | fixing the shape properties border bindings. | Valerio Virgillito | 2012-03-22 |
| |/ / / / / / / |
|
| * | | | | | | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| * | | | | | | | Fixed the lock button for the shape properties bar | Valerio Virgillito | 2012-03-22 |
| * | | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
* | | | | | | | | Timeline : Bug Fix : IKNINJA 1374 | Jonathan Duran | 2012-03-23 |
* | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-23 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso... | Jon Reid | 2012-03-21 |
| | |_|_|_|/ /
| |/| | | | | |
|
* | | | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ... | Ananya Sen | 2012-03-16 |
| | |_|_|_|/
| |/| | | | |
|
* / | | | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
|/ / / / / |
|
* / / / / | adding a focus manager to handle panel bugs where blur was not getting called... | Valerio Virgillito | 2012-03-14 |
|/ / / / |
|
* | | | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
* | | | | Merge pull request #112 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-03-13 |
|\ \ \ \ |
|