aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-23
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
| | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| | * | | | | | | | | | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | | | |_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ...Nivesh Rajbhandari2012-04-30
| | * | | | | | | | | | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| | |/ / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | |/ / / / / / / / / / / / /
| * / / / / / / / / / / / / / Fixing bindings to new modelJose Antonio Marquez2012-05-01
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / Initial Setup of the binding ToolArmen Kesablyan2012-05-07
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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 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 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-04-25
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-04-24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | 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/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
| |