aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-03
|\
| * adding missing montage to the user library and temporary fix for picas screen...Valerio Virgillito2012-07-03
* | Text Tool 2Armen Kesablyan2012-07-03
* | Merge branch 'refs/heads/master' into GIO-TextToolArmen Kesablyan2012-07-02
|\|
| * 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 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
| * | | | 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
| * | | | 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
| | | | |/ / | | | |/| |
| * | | | | 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 pull request #358 from jreid01/timeline-prValerio Virgillito2012-06-28
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| | |/ / /
| * | | | Merge pull request #361 from ericguzman/PresetsUpdate_6_28Valerio Virgillito2012-06-28
| |\ \ \ \
| | * | | | Presets/CSS Panel - Update css panel with preset class.Eric Guzman2012-06-28
| | | |_|/ | | |/| |
| * | | | Merge pull request #354 from mencio/IKNINJA-1829Valerio Virgillito2012-06-28
| |\ \ \ \
| | * | | | removing some commentsValerio Virgillito2012-06-28
| | * | | | Fixing the button for the shape piValerio Virgillito2012-06-28
| * | | | | Merge pull request #355 from dhg637/GIO_binding-viewValerio Virgillito2012-06-28
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Binding View - Multi document bug : cleared object bindings when current docu...Armen Kesablyan2012-06-28
| | * | | | Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal ...Armen Kesablyan2012-06-28
| | |\ \ \ \
| | | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bin...Eric Guzman2012-06-28
| | | |\| | |
| | | * | | | Binding HUD - Updated CSS for hud and promoted/bound properties.Eric Guzman2012-06-28
| | * | | | | Binding View - Bug fix After save corrupts doom and breaks binding viewArmen Kesablyan2012-06-28
| * | | | | | Changing the livePreview button to do a chromePreview and keeping the canvas ...Valerio Virgillito2012-06-28
| | |_|_|/ / | |/| | | |
| * | | | | Fixing body PI background getterJose Antonio Marquez2012-06-28
| * | | | | Fixing chips updating with alpha changeJose Antonio Marquez2012-06-28
| * | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-28
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fixing body background bugJose Antonio Marquez2012-06-28
| * | | | | Fixing init alpha issueJose Antonio Marquez2012-06-28