| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-04-04 |
| |\ | | | | | | | | | Conflicts: js/controllers/presets-controller.js | ||
| | * | Squashed commit of Preparing for the montage undo-manager: Architecture changes | Valerio Virgillito | 2012-04-04 |
| | | | | | | | | | | | | | | | | | | | Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Animation Presets - Only combine animations if pre-existing animations exist | Eric Guzman | 2012-04-02 |
| | | | |||
| * | | Presets Controller - Remove unused method call | Eric Guzman | 2012-03-30 |
| | | | |||
| * | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-29 |
| |\| | |||
| | * | Merge pull request #147 from pushkarjoshi/brushtool | Valerio Virgillito | 2012-03-29 |
| | |\ | | | | | | | Brushtool | ||
| | | * | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-28 |
| | | |\ | |||
| | | * \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ | |||
| | | * \ \ | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-27 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/shapes-controller.js | ||
| | | * | | | | revert to using the angle without flipping its sign...fixing some minor bugs ↵ | Pushkar Joshi | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and code cleanup GOOD status before doing 3D unprojection step | ||
| | | * | | | | Merge branch 'master' into brushtool | Pushkar Joshi | 2012-03-16 |
| | | |\ \ \ \ | |||
| | | * | | | | | update values in the PI from values of the selected brush stroke or pen tool ↵ | Pushkar Joshi | 2012-03-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | path | ||
| | | * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-03-14 |
| | | |\ \ \ \ \ | |||
| | | * | | | | | | PI for pen and brush strokes | Pushkar Joshi | 2012-03-14 |
| | | | | | | | | | |||
| | * | | | | | | | Merge pull request #131 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Pull request IKNINJA-1302, IKNINJA-1367, IKNINJA-1361, IKNINJA-1364, IKNINJA-1302, IKNINJA-1266 | ||
| | | * | | | | | | - enable/disable save, saveAs, saveAll, close, closeAll as per documents open | Ananya Sen | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added close file and close all menu items Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/helper-classes/3D/draw-utils.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | | | | | | Merge pull request #145 from ericguzman/PresetsPI | Valerio Virgillito | 2012-03-28 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Presets - Adding presets controller | ||
| | * | | | | | | | Reverting change for IKNinja-1355 because it is causing line tool to fail. | Nivesh Rajbhandari | 2012-03-27 |
| | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | | | Presets - Remove style transition when transition doesn't start. Also added ↵ | Eric Guzman | 2012-03-29 |
| | |/ / / / / |/| | | | | | | | | | | | | | | | | | temporary fix for aggregating animations (from timeline/presets) | ||
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPI | Eric Guzman | 2012-03-27 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #142 from joseeight/Color | Valerio Virgillito | 2012-03-26 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Color Bug Fix | ||
| | | * | | | | | Fix: IKNINJA-1355 | Jose Antonio Marquez | 2012-03-26 |
| | | |/ / / / | |||
| | * | | | | | Fixed a problem switching from 3D to 2D and back to 3D. | hwc487 | 2012-03-23 |
| | | | | | | | |||
| | * | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-23 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | Respect play/pause WebGL animation when saving files and re-rendering caused ↵ | Nivesh Rajbhandari | 2012-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by geometry changes. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | | | | | Adding checkbox in PI to start/stop WebGL animation preview. | Nivesh Rajbhandari | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | Squashed commit of the following GL integration | Valerio Virgillito | 2012-03-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/Ninja-Montage-Integration' into ↵ | Jose Antonio Marquez | 2012-03-22 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | Changes to the webrequest blocking and adding a google.com permission workaround | Valerio Virgillito | 2012-03-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Adding firstDraw event to components added | Jose Antonio Marquez | 2012-03-22 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | This will allow us to re-parse the document for styles added dynamically. | ||
| | * | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| | |\ \ \ \ \ | |||
| | | * | | | | | Removing usage of webRequest APIs | Jose Antonio Marquez | 2012-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 Marquez | 2012-03-21 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | FileIO-Montage-Components | ||
| | | * | | | | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | | | | | fixing the selection for the picasa carousel | Valerio Virgillito | 2012-03-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Montage-Components | Jose Antonio Marquez | 2012-03-21 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||
| | * | | | | | fixing the selection of components. Temporary workaround for now. | Valerio Virgillito | 2012-03-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | Adding back webkit-transform styles in set3DProperties. Changing "zoom" to ↵ | Valerio Virgillito | 2012-03-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "zoomValue" in map component to avoid scaling the map. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | | | fixing the map styles and temporary disabling the 3d styles for elements. | Valerio Virgillito | 2012-03-17 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | | Presets Panel - Adding presets controller and removing functionality from ↵ | Eric Guzman | 2012-03-22 |
| | |/ / / |/| | | | | | | | | | | | panel code | ||
| * | | | | Support button control in Properties Panel and use them for edit fill and ↵ | Nivesh Rajbhandari | 2012-03-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | stroke material. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Removing zoom from element's getMatrix. Zoom should only be checked on stage. | Nivesh Rajbhandari | 2012-03-20 |
| |/ / / | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | IKNINJA-1305 : fixed the check for stopVideos() method's existence | Ananya Sen | 2012-03-16 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Removing the name attribute from the PI. Fixing the ID and Class attribute ↵ | Valerio Virgillito | 2012-03-14 |
| | |/ |/| | | | | | | | | | from the PI Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Some code cleanup - removing unused assignments. | Valerio Virgillito | 2012-03-13 |
| |/ | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #110 from mqg734/WebGLFixes | Valerio Virgillito | 2012-03-13 |
| |\ | | | | | Gradient Support for Shapes and Eyedropper support for gradients. Also fixed 3d bug when moving multiple selections in 3d using the Selection Tool | ||
| | * | Fixed element mediator, PI, and eye-dropper to handle different borders ↵ | Nivesh Rajbhandari | 2012-03-12 |
| | | | | | | | | | | | | | sides and gradients. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebG | ||