aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* 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
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Button's enabled property binding should be oneway only.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Deleting unused Materials.xml file since we converted to JSON.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Support edit material button in oval and line PI.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Support button control in Properties Panel and use them for edit fill and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Fixing error in drawUtils when closing document - should set _eltArray and ↵Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _planesArray's length to 0 instead of setting the arrays to null. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage.Nivesh Rajbhandari2012-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Use new tree control in Materials panel.Nivesh Rajbhandari2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | montage-integration
| * | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Eric Guzman2012-03-20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | FeedReaderAnimation
| * | | | | | Presets - Animation updateEric Guzman2012-03-20
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-20
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | montage-integration
| * | | | | | Fixing the selection issuesValerio Virgillito2012-03-20
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'refs/heads/button-switch' into montage-integrationValerio Virgillito2012-03-20
|\ \ \ \ \ \
| * | | | | | fully removing our old button component from NinjaValerio Virgillito2012-03-19
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | montage-integration
| * | | | | fixing the selection for the picasa carouselValerio Virgillito2012-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge branch 'master' of github.com:francoisfrisch/ninja-internal into ↵Valerio Virgillito2012-03-19
|\| | | | | | | | | | | | | | | | | | | | | | | montage-integration
| * | | | | Maps - Apply default width and height styles to components if specified. ↵Nivesh Rajbhandari2012-03-19
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Change default location to Sunnyvale. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | fixing the selection of components. Temporary workaround for now.Valerio Virgillito2012-03-18
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | looping through both branches of the components treeValerio Virgillito2012-03-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-19
|\ \ \ \ | |/ / / |/| / / | |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 06:51:48 +0000