Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-29 | |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-07-03 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | | | ||||
| * | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | clean up | Jonathan Duran | 2012-06-28 | |
| | * | | | | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUber | Jonathan Duran | 2012-06-28 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-06-28 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | Timeline: Better deselection of tweens when selecting/deselecting layers. | Jon Reid | 2012-06-28 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
| |\| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Bug Fix : Hot text updates with keyframe selection | Kruti Shah | 2012-06-28 | |
| * | | | | | | | | | | | | Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti | Kruti Shah | 2012-06-28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #399 from joseeight/Color | Valerio Virgillito | 2012-07-17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Fix: IKNINJA-1935 - Chips handling alpha 0 values | Jose Antonio Marquez | 2012-07-17 | |
| |/ / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-17 | |
|\| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | Merge pull request #396 from ananyasen/codemirror2.3-upgrade | Valerio Virgillito | 2012-07-17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | upgrade to codemirror 2.3 | Ananya Sen | 2012-07-16 | |
| |/ / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-17 | |
|\| | | | | | | | | | | | ||||
| * | | | | | | | | | | | update Readme.md to add info about hidden user library folder on Lion. | San Khong | 2012-07-16 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 | |
|\| | | | | | | | | | | ||||
| * | | | | | | | | | | Merge pull request #392 from joseeight/Document | Valerio Virgillito | 2012-07-16 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | CSS Fixes for Windows | Jose Antonio Marquez | 2012-07-16 | |
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-16 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | New: Added knob to timeline resizer | Jose Antonio Marquez | 2012-07-13 | |
| | * | | | | | | | | | | | New: Improved Breadcrumb Layout | Jose Antonio Marquez | 2012-07-13 | |
| | * | | | | | | | | | | | Merge pull request #42 from mencio/breadcrumb-container | Jose Antonio Marquez Russo | 2012-07-12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | adding a container around the breadcrumb button | Valerio Virgillito | 2012-07-12 | |
| | |/ / / / / / / / / / / | ||||
| | * | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | Improving Document Bar UI | Jose Antonio Marquez | 2012-07-12 | |
| * | | | | | | | | | | | | | Merge pull request #394 from mayhewinator/master | Valerio Virgillito | 2012-07-16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Added back one copyright block so it is properly included in the ninja.css ou... | John Mayhew | 2012-07-16 | |
| | * | | | | | | | | | | | | | Fixed incorrect comment blocks around our open source copyright notice. These... | John Mayhew | 2012-07-16 | |
* | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 | |
|\| | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Merge pull request #393 from mayhewinator/master | Valerio Virgillito | 2012-07-16 | |
| |\| | | | | | | | | | | | | | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja | John Mayhew | 2012-07-16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Trademark Update - added trademarked Ninja name to the splash screen and abou... | John Mayhew | 2012-07-16 | |
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-16 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #391 from joseeight/Color | Valerio Virgillito | 2012-07-14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-11 | |
| | |\| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Color | Jose Antonio Marquez | 2012-07-10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | Fixing IKNINJA-1634 | Jose Antonio Marquez | 2012-07-10 | |
| * | | | | | | | | | | | | | | Update Readme.md to fix some typos | San Khong | 2012-07-13 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-12 | |
|\| | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | Merge pull request #389 from ericmueller/GridFixes | Valerio Virgillito | 2012-07-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixes | hwc487 | 2012-07-11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | re-wrote the radial blur shader. Changed tolerances in the deformation shaders. | hwc487 | 2012-07-11 | |
| | * | | | | | | | | | | | | Tweak to an edge case in grid drawing. | hwc487 | 2012-07-10 | |
| | * | | | | | | | | | | | | Grid drawing changes | hwc487 | 2012-07-10 | |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri... | hwc487 | 2012-07-10 | |
| | |\| | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | Grid drawing fixes | hwc487 | 2012-07-10 | |
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Gri... | hwc487 | 2012-07-09 | |
| | |\ \ \ \ \ \ \ \ \ \ |