aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
* Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
|\
| * Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
* | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
* | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-21
|\|
| * Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
* | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-21
|\|
| * Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\
| * \ Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
| |\ \
| * \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-21
| |\ \ \
| | * | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| * | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
| |\ \ \ \
* | \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-20
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
| |\ \ \ \ \ \
| | * | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| * | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag...Valerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix: Chrome 19 I/O BugJose Antonio Marquez2012-03-21
| * | | | | | | | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe...Eric Guzman2012-03-20
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| | | |_|_|_|/ / / | | |/| | | | | |
| * / | | | | | | Presets - Animation updateEric Guzman2012-03-20
| |/ / / / / / /
| * | | | / / / fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | |_|_|/ / / | |/| | | | |
| * | | | | | Maps - Apply default width and height styles to components if specified. Chan...Nivesh Rajbhandari2012-03-19
* | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 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
| * | | | | Replacing old button component with montage button component in our UI.Nivesh Rajbhandari2012-03-19
| | |/ / / | |/| | |
* | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
* | | | | Tests and clean-upJose Antonio Marquez2012-03-18
* | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
|\| | | |
| * | | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | |_|/ | |/| |