aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:mayhewinator/ninja-internalJohn Mayhew2012-07-03
|\
| * adding missing montage to the user library and temporary fix for picas screen...Valerio Virgillito2012-07-03
| * Merge pull request #369 from aadsm/gh-329_template-creator-restores-elementValerio Virgillito2012-07-03
| |\
| | * gh-329 Make Template Creator restore the elements after serializationAntónio Afonso2012-07-03
| |/
* / Updated manifest.json for alpha buildJohn Mayhew2012-07-03
|/
* updating to version 7.0Valerio Virgillito2012-06-29
* Merge pull request #360 from joseeight/DocumentValerio Virgillito2012-06-29
|\
| * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| |\ | |/ |/|
* | Merge pull request #363 from ericguzman/stylesControllerPatch_6_29Valerio Virgillito2012-06-29
|\ \
| * | Another null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * | Null check on results from getMatchedCSSRulesEric Guzman2012-06-29
| * | Styles Controller - getMatchingRules - Add forgotten return statementEric Guzman2012-06-29
| * | Styles controller - adding check for attached element in getMatchedCSSRulesEric Guzman2012-06-29
| * | Styles Controller Patch to ignore unfound rules from getMatchedCSSRulesEric Guzman2012-06-29
| | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | |\ | |_|/ |/| |
* | | Merge pull request #362 from mqg734/ColorGradientFixValerio Virgillito2012-06-29
|\ \ \
| * \ \ Merge branch 'refs/heads/ninja-internal' into ColorGradientFixNivesh Rajbhandari2012-06-29
| |\ \ \ | |/ / / |/| | |
| * | | Need to special case linear gradient, radial gradient and uber materials when...Nivesh Rajbhandari2012-06-29
| * | | Fixed not being able to draw linear and radial gradients. Also fixed IKNINJA-...Nivesh Rajbhandari2012-06-28
| | | * Merge pull request #41 from mencio/video-fixJose Antonio Marquez Russo2012-06-29
| | | |\
| | | | * fixing someValerio Virgillito2012-06-29
| | | |/
| | | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-29
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #350 from ericguzman/StylesController_6_27Valerio Virgillito2012-06-29
|\ \ \ \
| * | | | Styles Controller - removing console logsEric Guzman2012-06-29
| * | | | Styles Controller - Fix specificity comparison in hasGreaterSpecificity()Eric Guzman2012-06-27
* | | | | Merge pull request #356 from mencio/google-components-fixesValerio Virgillito2012-06-29
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix for the youtube component close button on windowsValerio Virgillito2012-06-28
| | | | * Fixing reference to objectJose Antonio Marquez2012-06-28
| | | | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #351 from ananyasen/bugfix-masterValerio Virgillito2012-06-28
|\ \ \ \ \
| * | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-28
| |\| | | |
| * | | | | fixed IKNINJA-1762 [Copy/Cut on canvas tag tool throws error on console] -> d...Ananya Sen2012-06-27
| | |/ / / | |/| | |
| | | | * Merge pull request #40 from mencio/video-fixJose Antonio Marquez Russo2012-06-28
| | | | |\
| | | | | * video autopsy fix: moving the event handler on creationValerio Virgillito2012-06-28
| | | | | * Merge branch 'refs/heads/Document' into video-fixValerio Virgillito2012-06-28
| |_|_|_|/| |/| | | |/
| | | | * Relocating codeJose Antonio Marquez2012-06-28
| | | | * Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | | |\
| | | | * | Fixing video autoplay bug in PIJose Antonio Marquez2012-06-28
| | | | * | Preventing video playback on openJose Antonio Marquez2012-06-28
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | | |\ \ | | | |_|/ / | | |/| | |
| | | | * | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-28
| | | | |\ \
| | | | * \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-27
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-25
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-22
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-21
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| | | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-06-20
| | | | |\ \ \ \ \ \ \ \ \ \
* | | | | \ \ \ \ \ \ \ \ \ \ Merge pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |