aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | | | | | | | | | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|/ / / / / / / / / / / | | | | | | | |/| | | | | | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | Fixing alpha binding bugJose Antonio Marquez2012-06-25
| | | | | | | | | | | * | | | | | | | | | | Fixing bottom hit test for popupJose Antonio Marquez2012-06-25
| | | | | | | | | | | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | Cleaning up eventsJose Antonio Marquez2012-06-25
| | | | | | | | | | | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-25
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | Color Popup Test CandidateJose Antonio Marquez2012-06-25
| | | | | | | | | | | * | | | | | | | | | | | Adding support for gradients on chipsJose Antonio Marquez2012-06-23
| | | | | | | | | | | * | | | | | | | | | | | Adding gradient mode to toolsJose Antonio Marquez2012-06-23
| | | | | | | | | | | * | | | | | | | | | | | Fixing logic for popup value bubblingJose Antonio Marquez2012-06-23
| | | | | | | | | | | * | | | | | | | | | | | Deleting obsolete filesJose Antonio Marquez2012-06-23
| | | | | | | | | | | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | Added third gradient chip popupJose Antonio Marquez2012-06-22
| | | | | | | | | | | * | | | | | | | | | | | Fixing bug with gradient stop limitsJose Antonio Marquez2012-06-22
| | | | | | | | | | | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-22
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | Fix closing logic and init color on chipJose Antonio Marquez2012-06-22
| | | | | | | | | | | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-21
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | | * | | | | | | | | | | | Replacing temp color chip popJose Antonio Marquez2012-06-21
| | | | | | | | | | | | | | | | | | | | | | * Performance fix for WebGL materials playing even when the dialog/file is no l...Nivesh Rajbhandari2012-06-27
| | | | | | | | | | | | | | | | | | | | | | * Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #339 from ananyasen/bugfix-masterValerio Virgillito2012-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #341 from ericguzman/Chrome20_CSS_WorkaroundValerio Virgillito2012-06-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Styles Controller - Remove debuggerEric Guzman2012-06-26
| * | | | | | | | | | | | | | | | | | | | Styles Controller - Chrome 20 FixEric Guzman2012-06-26
|/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | initialize auto code hinting flag with checkbox value, on switching between d...Ananya Sen2012-06-27
| * | | | | | | | | | | | | | | | | | | turning off autocompletion since it is interfering typingAnanya Sen2012-06-26
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into bugfix-masterAnanya Sen2012-06-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #340 from mencio/panel-cleanup-scrollValerio Virgillito2012-06-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into panel-cleanup-scrollValerio Virgillito2012-06-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | removing un-necessary panel styles and possibly fix IKNINJA-1626Valerio Virgillito2012-06-26
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #323 from dhg637/bindingValerio Virgillito2012-06-26