aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internalValerio Virgillito2012-03-17
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | Youtube video is droppableFrançois Frisch2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel
| * | | | | | | | | | | Youtube video is droppableFrançois Frisch2012-03-17
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still getting errors with the carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Integrating picasa carousel and youtube channelFrançois Frisch2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Adding the youtube playerFrançois Frisch2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | Added a new picasa-carousel component as well as an example using itBenoit Marchant2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | fixing the map styles and temporary disabling the 3d styles for elements.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | adding element creation for the map and feedreader components.Valerio Virgillito2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Fixed snap-manager to stop snapping after first level children.Nivesh Rajbhandari2012-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Adding components to PIFrançois Frisch2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | Deleting unecessary propertyFrançois Frisch2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | Adding feed reader and mapFrançois Frisch2012-03-17
| | | | | | | | | | |
| * | | | | | | | | | Getting ownerComponent bindingsFrançois Frisch2012-03-17
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal ↵Jonathan Duran2012-03-27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into TimelineUber Conflicts: js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | | | | | | | Timeline : Zoom Slider StylingKruti Shah2012-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | Timeline : Breadcrumb FixKruti Shah2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | Timeline : Adding Zoom SliderKruti Shah2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | | | | | | | Timeline: Change dragIcon to be a data-uri.Jon Reid2012-03-26
| | | | | | | | | | |
* | | | | | | | | | | Timeline: Drag and Drop of layers.Jon Reid2012-03-26
| | | | | | | | | | |
* | | | | | | | | | | Remove console logsJonathan Duran2012-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> Signed-off-by: Jonathan Duran <jduran@motorola.com>
* | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-23
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Timeline: First integration of drag and drop of layers.Jon Reid2012-03-21
| | | | | | | | | | |
| * | | | | | | | | | Timeline: Bug fix: style collapsers not staying in synch. Also, removed ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console.log calls in hintable component.
| * | | | | | | | | | Fix: Change click handler to mousedown for better responsiveness in layer ↵Jon Reid2012-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | selection UI.
| * | | | | | | | | | Timeline: fix layer and style select problems.Jon Reid2012-03-20
| | | | | | | | | | |
| * | | | | | | | | | Timeline: Re-enable adding/removing styles to layers. New methods in ↵Jon Reid2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimelinePanel for creating new styles on document load.
* | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-21
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json ...
| | * | | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Added Montage button as a valid PI control and used it to invoke the edit material popup.
| | * | | | | | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | |