aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Expand)AuthorAge
* FIx - can't delete keyframesJonathan Duran2012-06-22
* remove unneeded filesJonathan Duran2012-06-20
* Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-14
| |\
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-13
| |\ \
| * | | Removed references to NJUtilshwc4872012-06-12
| * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-12
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-06-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-31
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex...hwc4872012-05-11
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update materials to the new texture model.hwc4872012-04-26
* | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O...Nivesh Rajbhandari2012-06-13
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\| | | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | first iteration of adding serializable to ninja plus other changes to run the...Valerio Virgillito2012-06-06
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | F6 support for keyframesJonathan Duran2012-06-15
* | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | removing all model creators.Valerio Virgillito2012-06-05
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-05
| | | |\| | | | | | |
| | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | |
| | | * | | | | | | | allow changes in the pen subtool in options to be seen by the pen tool code (...Pushkar Joshi2012-05-22
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Updated ink bottle tool to support color-chip's checkbox and undo/redo for st...Nivesh Rajbhandari2012-06-05
| | | * | | | | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Adding saving blocking screenJose Antonio Marquez2012-06-04
| | * | | | | | | Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| | |\| | | | | |
| | * | | | | | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| | |\| | | | |
| | | * | | | | Fixing CSS overwrite issueJose Antonio Marquez2012-05-30
| | | * | | | | Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | |/ / / | | | |/| | |
| | * / | | | document bindings phase 1Valerio Virgillito2012-05-29
| | |/ / / /
* | | | | | Sub PropsKruti Shah2012-06-12
* | | | | | Color ChipKruti Shah2012-05-31
|/ / / / /
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | |