Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | John Mayhew | 2012-07-09 |
|\ | |||
| * | adding missing copyright to the feed reader. | Valerio Virgillito | 2012-07-06 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #373 from kriskowal/bsd | Valerio Virgillito | 2012-07-06 |
| |\ | | | | | | | Update copyright boilerplate | ||
| | * | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
| |/ | |||
* | | Merge branch 'master' of github.com:mayhewinator/ninja-internal | John Mayhew | 2012-07-03 |
|\| | |||
| * | adding missing montage to the user library and temporary fix for picas ↵ | Valerio Virgillito | 2012-07-03 |
| | | | | | | | | | | | | screen trash Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Merge pull request #369 from aadsm/gh-329_template-creator-restores-element | Valerio Virgillito | 2012-07-03 |
| |\ | | | | | | | gh-329 Make Template Creator restore the elements after serialization | ||
| | * | gh-329 Make Template Creator restore the elements after serialization | António Afonso | 2012-07-03 |
| |/ | | | | | To create the serialization the element of each component needs to point to a new one, since the code was not restoring these elements the components were left in an undefined state. | ||
* / | Updated manifest.json for alpha build | John Mayhew | 2012-07-03 |
|/ | |||
* | updating to version 7.0 | Valerio Virgillito | 2012-06-29 |
| | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | Merge pull request #360 from joseeight/Document | Valerio Virgillito | 2012-06-29 |
|\ | | | | | Adding fix to prevent video from playing | ||
| * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| |\ | |/ |/| | |||
* | | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29 | Valerio Virgillito | 2012-06-29 |
|\ \ | | | | | | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules | ||
| * | | Another null check on results from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | |||
| * | | Null check on results from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | |||
| * | | Styles Controller - getMatchingRules - Add forgotten return statement | Eric Guzman | 2012-06-29 |
| | | | |||
| * | | Styles controller - adding check for attached element in getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | |||
| * | | Styles Controller Patch to ignore unfound rules from getMatchedCSSRules | Eric Guzman | 2012-06-29 |
| | | | |||
| | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #362 from mqg734/ColorGradientFix | Valerio Virgillito | 2012-06-29 |
|\ \ \ | | | | | | | | | Fixed not being able to draw linear and radial gradients and two other tools bugs. | ||
| * \ \ | Merge branch 'refs/heads/ninja-internal' into ColorGradientFix | Nivesh Rajbhandari | 2012-06-29 |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Need to special case linear gradient, radial gradient and uber materials ↵ | Nivesh Rajbhandari | 2012-06-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | when applying fill and stroke colors. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | Fixed not being able to draw linear and radial gradients. Also fixed ↵ | Nivesh Rajbhandari | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1721 - File dirty marker does not show when modifying elements and IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Squashed commit of the following: commit 7cad082c89911d34a99feeef8e91d22b89cae8f1 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:52:07 2012 -0700 Fix for not being able to draw linear and radial gradient materials. I'm turning off pre-flight support of gradients for WebGL since it conflicts with the materials' color support. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit d0df8a2bff052d855bafb7885792b1dfff8eab7d Merge: 2c67d26 b4b54f6 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 17:50:11 2012 -0700 Merge branch 'refs/heads/ninja-internal' into ToolFixes commit 2c67d264851f0897fdca8ca887c1c82d0e434217 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 15:06:13 2012 -0700 IKNINJA-1721 - File dirty marker does not show when modifying elements. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bb4b6a52eb75efb2f435cdb53f810ae3bc1f1fc3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Thu Jun 28 11:15:34 2012 -0700 IKNinja-1581 and IKNinja-1758 - Paint bucket fill bugs with lines and brush objects. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | | * | Merge pull request #41 from mencio/video-fix | Jose Antonio Marquez Russo | 2012-06-29 |
| | | |\ | | | | | | | | | | | Fixing the video bug | ||
| | | | * | fixing some | Valerio Virgillito | 2012-06-29 |
| | | |/ | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-29 |
| | | |\ | |_|_|/ |/| | | | |||
* | | | | Merge pull request #350 from ericguzman/StylesController_6_27 | Valerio Virgillito | 2012-06-29 |
|\ \ \ \ | | | | | | | | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity | ||
| * | | | | Styles Controller - removing console logs | Eric Guzman | 2012-06-29 |
| | | | | | |||
| * | | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity() | Eric Guzman | 2012-06-27 |
| | | | | | |||
* | | | | | Merge pull request #356 from mencio/google-components-fixes | Valerio Virgillito | 2012-06-29 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix for the youtube component close button on windows | ||
| * | | | | Fix for the youtube component close button on windows | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | * | Fixing reference to object | Jose Antonio Marquez | 2012-06-28 |
| | | | | | |||
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge pull request #351 from ananyasen/bugfix-master | Valerio Virgillito | 2012-06-28 |
|\ \ \ \ \ | | | | | | | | | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] | ||
| * | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-master | Ananya Sen | 2012-06-28 |
| |\| | | | | |||
| * | | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> ↵ | Ananya Sen | 2012-06-27 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | don't generate data-RDGE-id for simple canvas element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | | | * | Merge pull request #40 from mencio/video-fix | Jose Antonio Marquez Russo | 2012-06-28 |
| | | | |\ | | | | | | | | | | | | | Video fix cleanup | ||
| | | | | * | video autopsy fix: moving the event handler on creation | Valerio Virgillito | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | | | * | Merge branch 'refs/heads/Document' into video-fix | Valerio Virgillito | 2012-06-28 |
| |_|_|_|/| |/| | | |/ | |||
| | | | * | Relocating code | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | I added the fix in the wrong location before, this is more proper, still needs to be moved to where the video element is created or added to the DOM (in this spot the event is added every time src is changed). | ||
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| | | | |\ | |||
| | | | * | | Fixing video autoplay bug in PI | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Adding functionality to prevent autoplay on videos while in author-time. Fixes chrome preview issues. | ||
| | | | * | | Preventing video playback on open | Jose Antonio Marquez | 2012-06-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | This stops all videos from playing on open file. The same fix needs to be applied when an users sets autoplay in the PI. | ||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-28 |
| | | | |\ \ | |||
| | | | * \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-27 |
| | | | |\ \ \ | |||
| | | | * \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-25 |
| | | | |\ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 |
| | | | |\ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-22 |
| | | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-06-21 |
| | | | |\ \ \ \ \ \ \ |