aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
* use data-montage-id instead of id in templateAnanya Sen2012-05-03
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\
| * Merge cleanupValerio Virgillito2012-04-27
| * Merge branch 'refs/heads/serialization'Valerio Virgillito2012-04-27
| |\
| | * Merge branch 'stage-document-architecture' of https://github.com/mencio/ninja...Valerio Virgillito2012-04-26
| | |\
| | | * Fixed the stage border and layout in the new templateValerio Virgillito2012-04-26
| | * | Removing all "module" declarations and replaced with "prototype" in preparati...John Mayhew2012-04-26
| | |/
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-26
| |\|
| * | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
| |\ \
| * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-24
| |\ \ \
| * | | | Breadcrumb FixKruti Shah2012-04-20
| * | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-20
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-29
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| * | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed conso...Jon Reid2012-03-21
* | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
| | * | | | | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-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
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-17
| |\| | | | | | |
| * | | | | | | | 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/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | cleanup unused code.Valerio Virgillito2012-04-19
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
|\| | | | | | |
| * | | | | | | 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
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| |_|/ / / / / |/| | | | | |
* | | | | | | Squashed commit of Preparing for the montage undo-manager: Architecture changesValerio Virgillito2012-04-04
| |_|_|/ / / |/| | | | |
* | | | | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 17:58:52 +0000