aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | | * | | | | Merge branch 'refs/heads/Timeline-jd' into Timeline-b2-latestKruti Shah2012-02-29
| | | |\ \ \ \ \
| * | | | | | | | Timeline: Document switching and code restructuring.Jon Reid2012-03-01
| * | | | | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdocJon Reid2012-02-29
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Timeline: document switching + new document.Jon Reid2012-02-29
* | | | | | | | | Merge pull request #92 from mqg734/WebGLFixesValerio Virgillito2012-03-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing flying off into space bug for translate tool too.Nivesh Rajbhandari2012-03-02
| * | | | | | | | | Don't draw transform handles if the stage is the target element.Nivesh Rajbhandari2012-03-02
| * | | | | | | | | Fix for jumping issue when moving items that have any 3d on them.Nivesh Rajbhandari2012-03-02
| * | | | | | | | | Fix for elements flying off into space when moving elements that overlap.Nivesh Rajbhandari2012-03-01
| * | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-03-01
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Fixed logic error when resizing with the top-left transform handles.Nivesh Rajbhandari2012-03-01
| * | | | | | | | | Re-fixing IKNinja-940 - Can't select objects when in side/top view.Nivesh Rajbhandari2012-03-01
| * | | | | | | | | Last-used material (instead of FlatMaterial) is applied to shape when turning...Nivesh Rajbhandari2012-02-29
| | |_|_|_|_|/ / / | |/| | | | | | |
| | | | | | | * | Formatting fixesJose Antonio Marquez2012-03-02
| | | | | | | |/
| | | | | | | * Minor logic fixes for URL resolution in CSSJose Antonio Marquez2012-03-02
| | | | | | | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #94 from ericguzman/PresetsPanelValerio Virgillito2012-03-02
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Presets Panel - Fix single-click activation, and transition cut-off bug.Eric Guzman2012-03-02
|/ / / / / / /
| | | | | | * Fixing CSS URL issuesJose Antonio Marquez2012-03-02
| | | | | | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-02
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #91 from mayhewinator/WorkingBranchmayhewinator2012-03-01
|\ \ \ \ \ \ \
| * | | | | | | updated name in our manifest and incremented base build numberJohn Mayhew2012-03-01
|/ / / / / / /
| | | | | | * Fixing IO RegExJose Antonio Marquez2012-03-02
| | | | | | * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-01
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #90 from mencio/stage-fixesValerio Virgillito2012-03-01
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into stage-fixesValerio Virgillito2012-03-01
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'stage-fixes' of github.com:mencio/ninja-internal into stage-fixesValerio Virgillito2012-03-01
| |\ \ \ \ \ \
| | * | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| * | | | | | | revert removing the webkit transform from elements.Valerio Virgillito2012-03-01
| |/ / / / / /
| * / / / / / stage and elements fixesValerio Virgillito2012-03-01
|/ / / / / /
| | | | | * Optimizing URL intercepting detectionJose Antonio Marquez2012-03-01
| | | | | * Merge pull request #24 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-29
| |_|_|_|/| |/| | | | |
| | | | | * Merge branch 'refs/heads/ninja-internal-master' into FileIOAnanya Sen2012-02-29
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'refs/heads/integration-candidate'Valerio Virgillito2012-02-29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #88 from mqg734/ToolFixesValerio Virgillito2012-02-29
| |\ \ \ \ \ \
| | * | | | | | Fix for performance issue when moving shapes. We don't need to call render e...Nivesh Rajbhandari2012-02-29
| * | | | | | | Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal i...Valerio Virgillito2012-02-29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in...Valerio Virgillito2012-02-29
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #87 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Preview FixJose Antonio Marquez2012-02-29
| | | * | | | | | | | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-02-29
| | | |\| | | | | | | |
| | | | * | | | | | | | Fix: Caching issue with chrome tab APIJose Antonio Marquez2012-02-29
| | | | * | | | | | | | Making class level url template variableJose Antonio Marquez2012-02-29
| | * | | | | | | | | | Merge pull request #86 from imix23ways/TimelineValerio Virgillito2012-02-29
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'refs/heads/integration-candidate' into TimelineJonathan Duran2012-02-29
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-02-29
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti...Jonathan Duran2012-02-29
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Timeline: Fix Selection , Partially Fix adding element to an already animated...Kruti Shah2012-02-28