Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | | | | | resolved a bad merge while removing comments. | Valerio Virgillito | 2012-07-17 | |
| | * | | | | | | | | Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixes | Valerio Virgillito | 2012-07-17 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | menu design update and bug fixes - Moved Preview to the document bar | Valerio Virgillito | 2012-07-17 | |
| | | | |_|_|/ / / / | | | |/| | | | | | | ||||
| | * / | | | | | | | removed left over comments. | Valerio Virgillito | 2012-07-17 | |
| | |/ / / / / / / | ||||
| * | | | | | | | | Merge branch 'Tracking' of https://github.com/joseeight/ninja | Valerio Virgillito | 2012-07-18 | |
| |\ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'refs/heads/Ninja-Master' into Tracking | Jose Antonio Marquez | 2012-07-18 | |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||
| | * | | | | | | | | Fix: Improved download UX for cloud app | Jose Antonio Marquez | 2012-07-18 | |
| | | |_|_|_|/ / / | | |/| | | | | | | ||||
| * | | | | | | | | Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninja | Valerio Virgillito | 2012-07-18 | |
| |\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | perform clipboard operations only if selection tool is selected since other t... | Ananya Sen | 2012-07-18 | |
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix | Ananya Sen | 2012-07-18 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | ||||
| | * | | | | | | | | removing iframes from pasted content to prevent frame injection attack | Ananya Sen | 2012-07-18 | |
| | * | | | | | | | | Try pasting the binary image first, since Windows Chrome places both binary a... | Ananya Sen | 2012-07-17 | |
| | * | | | | | | | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix | Ananya Sen | 2012-07-17 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | ||||
| | * | | | | | | | | Fixes : resize wrapper for content, prevent duplicate pastes | Ananya Sen | 2012-07-17 | |
| | * | | | | | | | | Fixed copy paste from external applications | Ananya Sen | 2012-07-16 | |
| * | | | | | | | | | upgrading the manifest back to v0.8.0 | Valerio Virgillito | 2012-07-18 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||
* | | | | | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-18 | |
|\| | | | | | | | | ||||
| * | | | | | | | | Merge branch 'refs/heads/master' into v0.7.1 | Valerio Virgillito | 2012-07-18 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | ||||
| * | | | | | | | | fixing the copyrights on the timeline branch pull request. | Valerio Virgillito | 2012-07-18 | |
| * | | | | | | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1 | Valerio Virgillito | 2012-07-18 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-18 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | ||||
| | * | | | | | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber | Jonathan Duran | 2012-07-17 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||
| | | * | | | | | | Multi Doc Zoom Slider Handling | Kruti Shah | 2012-07-17 | |
| | | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-17 | |
| | | |\ \ \ \ \ \ | ||||
| | * | \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-17 | |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||
| | | * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-17 | |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | | | ||||
| | * | / | | | | | | Timeline: Possible fix for new file/new style crash problem. | Jon Reid | 2012-07-17 | |
| | |/ / / / / / / | ||||
| | * | | | | | | | Timeline: Style zoom slider. | Jon Reid | 2012-07-17 | |
| | * | | | | | | | Timeline: Bug fix: Now able to add first keyframe to an element using | Jon Reid | 2012-07-17 | |
| | * | | | | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUber | Jonathan Duran | 2012-07-17 | |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | / / | | | | |_|_|/ / | | | |/| | | | | ||||
| | * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-16 | |
| | |\ \ \ \ \ \ | ||||
| | | * | | | | | | Timeline: Ameliorate slowness when adding first keyframe to an element. | Jon Reid | 2012-07-16 | |
| | | * | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-16 | |
| | | |\ \ \ \ \ \ | ||||
| | | * | | | | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better error | Jon Reid | 2012-07-16 | |
| | | * | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-11 | |
| | | |\ \ \ \ \ \ \ | ||||
| | | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local | Jon Reid | 2012-07-09 | |
| | | |\ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | Timeline: Delete unused file. | Jon Reid | 2012-07-09 | |
| | * | | | | | | | | | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (lef... | Kruti Shah | 2012-07-16 | |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||
| | * | | | | | | | | | Zooming the tweens | Kruti Shah | 2012-07-12 | |
| | * | | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-11 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | ||||
| | | * | | | | | | | | Fix layer array | Jonathan Duran | 2012-07-10 | |
| | | * | | | | | | | | Fix more missing char | Jonathan Duran | 2012-07-10 | |
| | | * | | | | | | | | Fix missing char and Temp fix missing image | Jonathan Duran | 2012-07-10 | |
| | | | |/ / / / / / | | | |/| | | | | | | ||||
| | * | | | | | | | | Adding Zoom Control to Property Tracks | Kruti Shah | 2012-07-10 | |
| | * | | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti | Kruti Shah | 2012-07-09 | |
| | |\| | | | | | | | ||||
| | | * | | | | | | | remove commas from var lines | Jonathan Duran | 2012-07-09 | |
| | | * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode | Kruti Shah | 2012-07-09 | |
| | | |\| | | | | | | ||||
| | | * | | | | | | | Adding comments | Kruti Shah | 2012-07-09 | |
| | | * | | | | | | | Refactoring Code | Kruti Shah | 2012-07-09 | |
| | | * | | | | | | | Remove Comment | Kruti Shah | 2012-07-03 |