aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Expand)AuthorAge
* Merge branch 'Fixes_071' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-20
|\
| * IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.Nivesh Rajbhandari2012-07-19
* | Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
|/
* Fixing chrome preview shortcutValerio Virgillito2012-07-18
* Fixed copy paste from external applicationsAnanya Sen2012-07-16
* BSD LicenseKris Kowal2012-07-09
* Remove trailing spacesKris Kowal2012-07-06
* Expand tabsKris Kowal2012-07-06
* Update copyright boilerplateKris Kowal2012-07-06
* Merge pull request #338 from mencio/IKNINJA-1615Valerio Virgillito2012-06-26
|\
| * Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrol...Valerio Virgillito2012-06-25
* | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefixJonathan Duran2012-06-22
|\|
| * Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
| |\
| * | - added io api to generate file from binaryAnanya Sen2012-06-21
| * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| |\ \
| * | | - Eric Guzman's styles-controller fix for relatively positionedAnanya Sen2012-06-13
| * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| |\ \ \
| * | | | - fixed multiple paste displacementAnanya Sen2012-06-08
* | | | | 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
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |