aboutsummaryrefslogtreecommitdiff
path: root/js/mediators
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-21
|\
| * remove unneeded filesJonathan Duran2012-06-20
| | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * Timeline: Re-enable drag-and-drop of layers, now with bonus DOMJon Reid2012-06-19
| | | | | | | | manipulation!
| * Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
| |\
| * \ Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * | | F6 support for keyframesJonathan Duran2012-06-15
| | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
| | |\ \ \
| | * \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | Sub PropsKruti Shah2012-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | Color ChipKruti Shah2012-05-31
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * \ \ \ \ \ \ Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-05-22
| |\ \ \ \ \ \ \
| | * | | | | | | Timeline: Multiselect improvements. New convenience methods. MultiselectJon Reid2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drag and drop.
* | | | | | | | | - added io api to generate file from binaryAnanya Sen2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactoring and cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-14
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | Textures
| | * | | | | | | Merge pull request #300 from mqg734/IKNinja_1715Valerio Virgillito2012-06-13
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/Off in the PI for the shape object.
| | | * | | | | | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option ↵Nivesh Rajbhandari2012-06-13
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On/Off in the PI for the shape object. We need to add the 'data-ninja'node' in replaceEelement as well. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-13
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| | * | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-06
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | Removed references to NJUtilshwc4872012-06-12
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-12
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: assets/canvas-runtime.js js/io/system/ninjalibrary.json js/mediators/element-mediator.js
| * | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-05
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | Textures
| * | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-06-04
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-31
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/io/system/ninjalibrary.json
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-17
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | Textures
| * | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵hwc4872012-05-11
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Textures Conflicts: js/lib/geom/geom-obj.js js/lib/geom/rectangle.js js/tools/TagTool.js
| * | | | | | | | |