aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix layer order and selection on reopenJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-local' into TimelineDOMJonathan Duran2012-03-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-local' into Timeline-local-2Jon Reid2012-03-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Hook up data binding for changes on subproperties.Jon Reid2012-03-16
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: remove comment.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Remove selection timer on add new layer method.Jon Reid2012-03-15
| | | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-localJon Reid2012-03-15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Timeline: Fix for layer selection problems on file open and switch.Jon Reid2012-03-15
| * | | | | | | | | | | | | | | | | | | | | | | | | Consolidate conversion functionsJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | | | CleanupJonathan Duran2012-03-16
| |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | Bug fix and cleanupJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | | Fix layer select on selection changeJonathan Duran2012-03-16
| * | | | | | | | | | | | | | | | | | | | | | | | Start enforcing one element per layerJonathan Duran2012-03-16
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #178 from mqg734/PerspectiveFixValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | We don't currently support perspective values on individual elements, so remo...Nivesh Rajbhandari2012-04-26
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fixing the eye dropper shortcut.Valerio Virgillito2012-04-26
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into DocumentJose Antonio Marquez2012-04-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #179 from joseeight/FileIOValerio Virgillito2012-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-04-26
| | |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer errorJose Antonio Marquez2012-04-26
| | * | | | | | | | | | | | | | | | | | | | | Fixing duplicate layer bugJose Antonio Marquez2012-04-26
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-04-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #175 from mqg734/BoundsCalculationValerio Virgillito2012-04-25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| | | |\| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Allow users to toggle application of stroke and border settings when using th...Nivesh Rajbhandari2012-04-24
| | | * | | | | | | | | | | | | | | | | | | Fixing translate handles to draw without zoom value. Also fixed some typos i...Nivesh Rajbhandari2012-04-20
| | | | |_