aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/Ninja-Montage-Integration' into FileIO-Montage-Compo...Jose Antonio Marquez2012-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
* | | 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
| |\ \ \ | | |/ / | |/| / | | |/
| | * 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
* | 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