| Commit message (Expand) | Author | Age |
* | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-22 |
|\ |
|
| * | Changes to the webrequest blocking and adding a google.com permission workaround | Valerio Virgillito | 2012-03-21 |
* | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 |
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-21 |
|\| |
|
| * | Adding 'addComponentFirstDraw' event from the user document main component. | Valerio Virgillito | 2012-03-21 |
* | | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo... | Jose Antonio Marquez | 2012-03-21 |
|\| |
|
| * | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ |
|
| * \ | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ \ |
|
| * \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag... | Valerio Virgillito | 2012-03-21 |
| |\ \ \ |
|
| | * | | | Presets Panel - Add Font style preset | Eric Guzman | 2012-03-21 |
| * | | | | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ |
|
* | \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
|\ \ \ \ \ \
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Merge pull request #125 from ananyasen/IO-patch-ninja-internal-master-ananya | Valerio Virgillito | 2012-03-21 |
| |\ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| | * | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ... | Ananya Sen | 2012-03-16 |
* | | | | | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag... | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag... | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'refs/heads/button-switch' into montage-integration | Valerio Virgillito | 2012-03-20 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | fully removing our old button component from Ninja | Valerio Virgillito | 2012-03-19 |
| * | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag... | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into montag... | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ \ \ \ \ \
| | | |_|/ / / / / /
| | |/| | | | | | | |
|
* | | | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Fix: Chrome 19 I/O Bug | Jose Antonio Marquez | 2012-03-21 |
| * | | | | | | | | | | Removing usage of webRequest APIs | Jose Antonio Marquez | 2012-03-21 |
| | |_|_|_|_|_|/ / /
| |/| | | | | | | | |
|
* | | | | | | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C... | Jose Antonio Marquez | 2012-03-21 |
|\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into FeedRe... | Eric Guzman | 2012-03-20 |
| |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | * | | | | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| * / | | | | | | | Presets - Animation update | Eric Guzman | 2012-03-20 |
| |/ / / / / / / |
|
| * | | | / / / | fixing the selection for the picasa carousel | Valerio Virgillito | 2012-03-19 |
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | Maps - Apply default width and height styles to components if specified. Chan... | Nivesh Rajbhandari | 2012-03-19 |
* | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | Button's enabled property binding should be oneway only. | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Deleting unused Materials.xml file since we converted to JSON. | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Support edit material button in oval and line PI. | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Support button control in Properties Panel and use them for edit fill and str... | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Fixing error in drawUtils when closing document - should set _eltArray and _p... | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 |
| * | | | | | Use new tree control in Materials panel. | Nivesh Rajbhandari | 2012-03-19 |
| | |_|/ /
| |/| | | |
|
| * | | | | Merge pull request #126 from ericguzman/AddAnimationsLibrary | Valerio Virgillito | 2012-03-19 |
| |\ \ \ \ |
|
| | * | | | | Presets Panel - Fix conflict with default transition presets | Eric Guzman | 2012-03-17 |
| | * | | | | Merge branch 'refs/heads/master' into AddAnimationsLibrary | Eric Guzman | 2012-03-17 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|
| | * | | | | Presets Panel - Change Tab labels, Add Un-3d preset | Eric Guzman | 2012-03-16 |
| * | | | | | Replacing old button component with montage button component in our UI. | Nivesh Rajbhandari | 2012-03-19 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C... | Jose Antonio Marquez | 2012-03-19 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 |
* | | | | | Tests and clean-up | Jose Antonio Marquez | 2012-03-18 |
* | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C... | Jose Antonio Marquez | 2012-03-18 |
|\| | | | |
|
| * | | | | looping through both branches of the components tree | Valerio Virgillito | 2012-03-18 |
| | |_|/
| |/| | |
|
| * | | | Youtube video is droppable | François Frisch | 2012-03-17 |