aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Merge pull request #138 from joseeight/FileIO-Montage-ComponentsValerio Virgillito2012-03-23
|\ | | | | I/O Fixes
| * Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-23
| |\ | | | | | | | | | FileIO-Montage-Components
| * | Removing m-js components I/O and fix for webGLJose Antonio Marquez2012-03-23
| | | | | | | | | | | | Removed saving m-js components as new components broke I/O when present. Also made a fix for checking length of webGL array since first item now is non-user data. (That is to be removed)
| * | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| |\ \ | | | | | | | | | | | | FileIO-Montage-Components
| | * \ Merge branch 'montage-integration' of ↵Valerio Virgillito2012-03-22
| | |\ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into montage-integration
| * | | | Adding Ninja URL method to io-mediatorJose Antonio Marquez2012-03-22
| | | | |
| * | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * | | | | Adding firstDraw event to components addedJose Antonio Marquez2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically.
| * | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵Jose Antonio Marquez2012-03-21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * \ \ \ \ \ \ 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 ...
| | | * | | | | | | fix for IKNINJA-1357 - Cannot create other file types such as css, json from ↵Ananya Sen2012-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the New file dialog box. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | | | Merge pull request #137 from ericguzman/montage-integrationValerio Virgillito2012-03-23
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Preset Heading - "3D" to "2D"
| * | | | | | | | | Presets - fixed preset group name ("2D")Eric Guzman2012-03-23
| | | | | | | | | |
* | | | | | | | | | Merge branch 'montage-integration' of github.com:ericguzman/ninja-internal ↵Valerio Virgillito2012-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into montage-integration
| * | | | | | | | | 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
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | Merge pull request #134 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding enabled/disabled support for PI"s checkbox controls, and using that capability for WebGL animate checkbox.
| * | | | | | | | | Adding enabled/disabled support for PI's checkbox control.Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | | | | Merge pull request #133 from mqg734/WebGL-Animation-CheckBoxValerio Virgillito2012-03-22
|\| | | | | | | | | | |_|_|_|_|_|_|/ / |/| | | | | | | | Web gl animation check box
| * | | | | | | | Start WebGL animation during live preview. And set WebGL animation back to ↵Nivesh Rajbhandari2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user preference when closing live preview. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | Adding checkbox in PI to start/stop WebGL animation preview.Nivesh Rajbhandari2012-03-22
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | fixing the shape properties border bindings.Valerio Virgillito2012-03-22
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Squashed commit of the following GL integrationValerio Virgillito2012-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Fixed the lock button for the shape properties barValerio Virgillito2012-03-22
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Changes to the webrequest blocking and adding a google.com permission workaroundValerio Virgillito2012-03-21
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Adding 'addComponentFirstDraw' event from the user document main component.Valerio Virgillito2012-03-21
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Fixed creating new files.
| | * | | | Removing usage of webRequest APIsJose Antonio Marquez2012-03-21
| | | |/ / | | |/| | | | | | | | | | | | Removed the usage of the webRequest API since all files are parsed on open to handle prefixing correct origin. This will most likely not work for assets that are added dynamically and will most likely break, all those adding linking to assets should make use of a function in the mediator to mask the display value and actual value of the linked asset.
| * | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * \ \ \ \ 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 ↵Jose Antonio Marquez2012-03-19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * | | | | | Tests and clean-upJose Antonio Marquez2012-03-18
| | | | | | |
| * | | | | | Merge branch 'refs/heads/francoisfrisch-Ninja-Internal' into ↵Jose Antonio Marquez2012-03-18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components
| * | | | | | | Temp I/O functionality for M-JS componentsJose Antonio Marquez2012-03-18
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Added the ability to save montages component serialization from Ninja. Very rough, but functional.
* | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | | | Presets Panel - Add Font style presetEric Guzman2012-03-21
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-21
|\ \ \ \ \ \ \ | | |_|_