aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-17
|\
| * Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
| |\
| | * Merge pull request #396 from ananyasen/codemirror2.3-upgradeValerio Virgillito2012-07-17
| | |\
| | | * upgrade to codemirror 2.3Ananya Sen2012-07-16
| | |/
* | / Timeline: Possible fix for new file/new style crash problem.Jon Reid2012-07-17
|/ /
* | Timeline: Style zoom slider.Jon Reid2012-07-17
* | Timeline: Bug fix: Now able to add first keyframe to an element usingJon Reid2012-07-17
* | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
|\|
| * update Readme.md to add info about hidden user library folder on Lion.San Khong2012-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 pull request #393 from mayhewinator/masterValerio Virgillito2012-07-16
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-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
| | | | | * | Trademark Update - added trademarked Ninja name to the splash screen and abou...John Mayhew2012-07-16
| | |_|_|/ / | |/| | | |
| * | | | | Update Readme.md to fix some typosSan Khong2012-07-13
| | |_|_|/ | |/| | |
| * | | | Merge pull request #389 from ericmueller/GridFixesValerio Virgillito2012-07-12
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge branch 'master' of github.com:Motorola-Mobility/ninja into GridFixeshwc4872012-07-11
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Update masterSan Khong2012-07-11
| * | | | Update masterSan Khong2012-07-11
| * | | | Update masterSan Khong2012-07-11
| * | | | Merge pull request #388 from mayhewinator/masterValerio Virgillito2012-07-10
| |\ \ \ \
| | * | | | Fix for incorrect doctype in last commitJohn Mayhew2012-07-10
| | * | | | final updates for Chrome App store releaseJohn Mayhew2012-07-10
| |/ / / /
| * | | / Updating the Readme.Valerio Virgillito2012-07-10
| | |_|/ | |/| |
| * | | Merge pull request #385 from ericmueller/ShadersRemovedValerio Virgillito2012-07-10
| |\ \ \ | | |_|/ | |/| |
| | * | Removed the shaders that we do not have rights to.hwc4872012-07-10
| |/ /
| | * 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
| | |\ | | |/ | |/|
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-07-09
| |\ \
| | * \ Merge pull request #384 from mayhewinator/masterValerio Virgillito2012-07-09
| | |\ \
| | | * | removed unnecessary company string in app name for license and creditsJohn Mayhew2012-07-09
| * | | | Add some <li> to the copyright noticeValerio Virgillito2012-07-09
| |/ / /
| * | | Merge pull request #382 from mayhewinator/masterValerio Virgillito2012-07-09
| |\| |
| | * | fixed incorrect capitalization for DOCTYPE htmlJohn Mayhew2012-07-09