aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'master' into brushtoolPushkar Joshi2012-03-27
|\
| * Merge pull request #142 from joseeight/ColorValerio Virgillito2012-03-26
| |\
| | * Fix: IKNINJA-1355Jose Antonio Marquez2012-03-26
| | * Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-03-26
| | |\
| | * | Fix: IKNINJA-1362Jose Antonio Marquez2012-03-26
| * | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-03-24
| * | | Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBoxNivesh Rajbhandari2012-03-24
| |\ \ \
| | * | | Fixed a problem switching from 3D to 2D and back to 3D.hwc4872012-03-23
| | * | | 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
| * | | | | | | | | | | Check for a authortime animation setting in the draw routine for WebGL.Nivesh Rajbhandari2012-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
| | | |_|_|_|_|/ | | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:45:27 +0000