aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'Timeline-latest-change' of github.com:ntfx47/ninja-internal int...Jonathan Duran2012-03-27
|\
| * Timeline : Zoom Slider StylingKruti Shah2012-03-27
| * Timeline : Breadcrumb FixKruti Shah2012-03-26
| * Timeline : Adding Zoom SliderKruti Shah2012-03-26
* | 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
* | Fix bug with track properties getting over writtenJonathan Duran2012-03-26
|/
* Timeline : Bug Fix : IKNINJA 1374Jonathan Duran2012-03-23
* 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 conso...Jon Reid2012-03-21
| * Fix: Change click handler to mousedown for better responsiveness in layer sel...Jon Reid2012-03-21
| * Timeline: fix layer and style select problems.Jon Reid2012-03-20
| * Timeline: Re-enable adding/removing styles to layers. New methods in Timeline...Jon Reid2012-03-19
* | 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 from ...Ananya Sen2012-03-16
| * | Merge pull request #129 from mqg734/WebGLMaterialsValerio Virgillito2012-03-20
| |\ \
| | * | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | * | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | * | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | * | Support button control in Properties Panel and use them for edit fill and str...Nivesh Rajbhandari2012-03-20
| | * | Fixing error in drawUtils when closing document - should set _eltArray and _p...Nivesh Rajbhandari2012-03-20
| | * | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | * | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| |/ /
| * | Merge pull request #126 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-19
| |\ \
| | * | Presets Panel - Fix conflict with default transition presetsEric Guzman2012-03-17
| | * | Merge branch 'refs/heads/master' into AddAnimationsLibraryEric Guzman2012-03-17
| | |\|
| | * | Presets Panel - Change Tab labels, Add Un-3d presetEric Guzman2012-03-16
| * | | Merge pull request #128 from mqg734/WebGLMaterialsValerio Virgillito2012-03-19
| |\ \ \ | | |_|/ | |/| |
| | * | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| |/ /
| * | Merge pull request #124 from ericguzman/AddAnimationsLibraryValerio Virgillito2012-03-16
| |\|
| | * Presets Panel - Adding Animations TabEric Guzman2012-03-16
| * | Squashed commit of SnapManagerFixesValerio Virgillito2012-03-16
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-16
| |\ \
| | * \ Merge pull request #122 from ananyasen/IO-patch-ninja-internal-master-ananyaValerio Virgillito2012-03-16
| | |\ \
| | | * | IKNINJA-1305 : fixed the check for stopVideos() method's existenceAnanya Sen2012-03-16
| | |/ /
| | * | Merge pull request #121 from dhg637/SomethingValerio Virgillito2012-03-16
| | |\ \
| | | * | Presets Panel: Added Scale Up and Down to transitions list. According to eric G.Armen Kesablyan2012-03-15
| * | | | fixing the components drag and drop.Valerio Virgillito2012-03-16
| |/ / /
| * | | fixing the drag and drop images to the pasteboardValerio Virgillito2012-03-16
| * | | Temp fix applied to all elementsJose Antonio Marquez2012-03-15
| * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-15
| |\ \ \
| | * \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-15
| | |\ \ \
| | | * \ \ Merge pull request #118 from mencio/pi-fixesValerio Virgillito2012-03-15
| | | |\ \ \
| | | | * \ \ Merge branch 'refs/heads/master' into pi-fixesValerio Virgillito2012-03-15
| | | | |\ \ \
| | | | * | | | Fixing the splitter resize canvas bug by getting the size when a document is ...Valerio Virgillito2012-03-14
| | | | * | | | adding a focus manager to handle panel bugs where blur was not getting called...Valerio Virgillito2012-03-14
| | | | * | | | Removing the name attribute from the PI. Fixing the ID and Class attribute fr...Valerio Virgillito2012-03-14