aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
|\
| * Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-23
| |\
| * | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-03-22
| |\ \
| | * \ Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-inte...Valerio Virgillito2012-03-22
| | |\ \
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-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 pull request #137 from ericguzman/montage-integrationValerio Virgillito2012-03-23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
* | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal in...Valerio Virgillito2012-03-23
|\| | | | | | | | |
| * | | | | | | | | Presets Panel - Add slide/fade out animationEric Guzman2012-03-23
* | | | | | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ...Nivesh Rajbhandari2012-03-23
|/ / / / / / / / /
* | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
* | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\| | | | | | | | | | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to us...Nivesh Rajbhandari2012-03-22
| * | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
* | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
|/ / / / / / /
* | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
* | | | | | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| |_|_|_|_|/ |/| | | | |
* | | | | | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
| |_|_|_|/ |/| | | |
* | | | | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| |_|_|/ |/| | |
* | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\| | |
| * | | Merge branch 'refs/heads/montage-integration' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \
| * \ \ \ 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 'refs/heads/Ninja-Internal' into FileIO-Montage-ComponentsJose Antonio Marquez2012-03-21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge branch 'refs/heads/FileIO-Montage-Components' into montage-integrationValerio Virgillito2012-03-21
|\| | | | |
| * | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-19
| |\ \ \ \ \
| * | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into FileIO-Montage-C...Jose Antonio Marquez2012-03-18
| |\ \ \ \ \ \
| * | | | | | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 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