aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into int...hwc4872012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | IOhwc4872012-03-06
| | | * | | | | | | | | | | | | | | | | Updated buildShapeModel to set PI and selection values too and also avoid fil...Nivesh Rajbhandari2012-03-06
| | | * | | | | | | | | | | | | | | | | update the shapeModel after importhwc4872012-03-06
| | | * | | | | | | | | | | | | | | | | Authortime import of 2d & 3d canvaseshwc4872012-03-06
| | | * | | | | | | | | | | | | | | | | Merge branch 'TimelineUber' of github.com:imix23ways/ninja-internal into inte...hwc4872012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | File IOhwc4872012-03-06
| | | * | | | | | | | | | | | | | | | | | Create element models based on nodeName.Nivesh Rajbhandari2012-03-06
| | | * | | | | | | | | | | | | | | | | | Corrections for canvas file IOhwc4872012-03-05
| | | * | | | | | | | | | | | | | | | | | WebGL & Canvas2D file IOhwc4872012-03-05
| | | * | | | | | | | | | | | | | | | | | Added more materials/canvas2D drawing to runtime.hwc4872012-03-05
| | | * | | | | | | | | | | | | | | | | | WebGL File IOhwc4872012-03-02
| | | * | | | | | | | | | | | | | | | | | Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into integrationhwc4872012-02-29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | WebGL file I/Ohwc4872012-02-29
| * | | | | | | | | | | | | | | | | | | | | Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| * | | | | | | | | | | | | | | | | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | turn off the fill color for pen tool paths by defaultPushkar Joshi2012-03-13
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into brushtoolPushkar Joshi2012-03-12
|\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | reverting old pi dataValerio Virgillito2012-03-09
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Temp Gradient FixJose Antonio Marquez2012-03-09
| * | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-09
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | * | | | | | | | | | | | | | | | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | * | | | | | | | | | | | | | | | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | * | | | | | | | | | | | | | | | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| | * | | | | | | | | | | | | | | | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | * | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | | * | | | | | | | | | | | | | | | Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| | | | * | | | | | | | | | | | | | | | Timeline: Fixing the layer switchingKruti Shah2012-03-05
| | | | * | | | | | | | | | | | | | | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of Bread...Kruti Shah2012-03-05
| | | * | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | | |\| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | / / / / / / / / / / / / / / / Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | | | | |/ / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | |