aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| | * | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-29
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-07-03
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | / / / / / / | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | clean upJonathan Duran2012-06-28
| | * | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-06-28
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-06-28
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers.Jon Reid2012-06-28
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\| | | | | | | | | |
| * | | | | | | | | | | Bug Fix : Hot text updates with keyframe selectionKruti Shah2012-06-28
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-krutiKruti Shah2012-06-28
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #399 from joseeight/ColorValerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fix: IKNINJA-1935 - Chips handling alpha 0 valuesJose Antonio Marquez2012-07-17
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #396 from ananyasen/codemirror2.3-upgradeValerio Virgillito2012-07-17
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | upgrade to codemirror 2.3Ananya Sen2012-07-16
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-17
|\| | | | | | | | | |
| * | | | | | | | | | update Readme.md to add info about hidden user library folder on Lion.San Khong2012-07-16
* | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #392 from joseeight/DocumentValerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | CSS Fixes for WindowsJose Antonio Marquez2012-07-16
| | * | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-16
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | New: Added knob to timeline resizerJose Antonio Marquez2012-07-13
| | * | | | | | | | | | | New: Improved Breadcrumb LayoutJose Antonio Marquez2012-07-13
| | * | | | | | | | | | | Merge pull request #42 from mencio/breadcrumb-containerJose Antonio Marquez Russo2012-07-12
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | adding a container around the breadcrumb buttonValerio Virgillito2012-07-12
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-12
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Improving Document Bar UIJose Antonio Marquez2012-07-12
| * | | | | | | | | | | | | Merge pull request #394 from mayhewinator/masterValerio Virgillito2012-07-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Added back one copyright block so it is properly included in the ninja.css ou...John Mayhew2012-07-16
| | * | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice. These...John Mayhew2012-07-16
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #393 from mayhewinator/masterValerio Virgillito2012-07-16
| |\| | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Trademark Update - added trademarked Ninja name to the splash screen and abou...John Mayhew2012-07-16
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-16
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #391 from joseeight/ColorValerio Virgillito2012-07-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-11
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into ColorJose Antonio Marquez2012-07-10
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixing IKNINJA-1634Jose Antonio Marquez2012-07-10
| * | | | | | | | | | | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-12
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | re-wrote the radial blur shader. Changed tolerances in the deformation shaders.hwc4872012-07-11
| | * | | | | | | | | | | | Tweak to an edge case in grid drawing.hwc4872012-07-10
| | * | | | | | | | | | | | Grid drawing changeshwc4872012-07-10
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-10
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | Grid drawing fixeshwc4872012-07-10
| | * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri...hwc4872012-07-09
| | |\ \ \ \ \ \ \ \ \ \ \ \