aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
...
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-04
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-03
| |\ \ \ \ \
| * | | | | | render the pen path with local coordinates, but use stage world coordinates t...Pushkar Joshi2012-04-02
* | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-23
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | adjusting the bread crumb to work with the new templateValerio Virgillito2012-04-23
| * | | | | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| * | | | | | initial stage web templateValerio Virgillito2012-04-18
| | |_|_|_|/ | |/| | | |
* | | | | | Breadcrumb FixKruti Shah2012-04-20
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | cleanup unused code.Valerio Virgillito2012-04-19
| |/ / / /
* | | | | BreadCrumb Bug FixKruti Shah2012-04-19
* | | | | Timeline: Bug fix: problem with editing layers missing last letter in newJon Reid2012-04-13
* | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-04-10
|\ \ \ \ \
| * | | | | Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names should notJon Reid2012-04-09
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-10
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-04-04
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | IKNINJA-764 - The Local/Global options are not in synced with both 3D object ...Nivesh Rajbhandari2012-03-27
| * | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-03-27
| |\ \ \ \
| * | | | | Tweaking some styles in the materials popup.Nivesh Rajbhandari2012-03-23
* | | | | | Timeline: Bug fix for IKNINJA-1086, "CSS Style Suggestion stops working"Jon Reid2012-04-05
* | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-04
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| | |_|_|/ | |/| | |
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
|\| | | |
| * | | | Merge pull request #147 from pushkarjoshi/brushtoolValerio Virgillito2012-03-29
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-28
| | |\ \ \
| | * \ \ \ Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-16
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into pentoolPushkar Joshi2012-03-14
| | |\ \ \ \ \
| | * | | | | | PI for pen and brush strokesPushkar Joshi2012-03-14
| | * | | | | | Merge branch 'pentool' into brushtoolPushkar Joshi2012-03-13
| | |\ \ \ \ \ \
| | * | | | | | | Add a smoothing amount parameter, and hide options based on checkboxesPushkar Joshi2012-03-13
| | * | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
| | |\ \ \ \ \ \ \
* | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
|\| | | | | | | | |
| * | | | | | | | | Merge pull request #131 from ananyasen/integration-candidateValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | fixed logical error in triggering menu itemAnanya Sen2012-03-26
| | * | | | | | | | - removed menu-data boundObj path support for nowAnanya Sen2012-03-22
| | * | | | | | | | IKNINJA-1364 : fixed css so that white spaces are not collapsed while renderingAnanya Sen2012-03-22
| | * | | | | | | | file picker - added size unitAnanya Sen2012-03-22
| | * | | | | | | | IKNINJA-1266 : restrict tab size for long file names and resize tabs on windo...Ananya Sen2012-03-22
| | * | | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents openAnanya Sen2012-03-22
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #139 from dhg637/ResizersRefactoringValerio Virgillito2012-03-28
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Resizers updatedArmen Kesablyan2012-03-23
| | |/ / / / / /
| * | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
| |\ \ \ \ \ \ \
| | * | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | * | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| * | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| |/ / / / / / /
| * | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| * | | | | | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| * | | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19