aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'copy-paste-bugfix' of https://github.com/ananyasen/ninjaValerio Virgillito2012-07-18
|\
| * perform clipboard operations only if selection tool is selected since other t...Ananya Sen2012-07-18
| * Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-18
| |\
| * | removing iframes from pasted content to prevent frame injection attackAnanya Sen2012-07-18
| * | Try pasting the binary image first, since Windows Chrome places both binary a...Ananya Sen2012-07-17
| * | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfixAnanya Sen2012-07-17
| |\ \
| * | | Fixes : resize wrapper for content, prevent duplicate pastesAnanya Sen2012-07-17
| * | | Fixed copy paste from external applicationsAnanya Sen2012-07-16
* | | | upgrading the manifest back to v0.8.0Valerio Virgillito2012-07-18
* | | | Merge branch 'refs/heads/master' into v0.7.1Valerio Virgillito2012-07-18
|\ \ \ \
| * | | | Update Readme.md to add info on Local Cloud settings to support installing mu...San Khong2012-07-18
| | |_|/ | |/| |
* | | | fixing the copyrights on the timeline branch pull request.Valerio Virgillito2012-07-18
* | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja into v0.7.1Valerio Virgillito2012-07-18
|\ \ \ \
| * | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-18
| |\| | |
| * | | | Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUberJonathan Duran2012-07-17
| |\ \ \ \
| | * | | | Multi Doc Zoom Slider HandlingKruti Shah2012-07-17
| | * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-17
| | |\ \ \ \
| * | \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-17
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'refs/heads/NINJA-master' into TimelineUberJonathan Duran2012-07-17
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| * | / | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| * | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-16
| |\ \ \ \
| | * | | | Timeline: Ameliorate slowness when adding first keyframe to an element.Jon Reid2012-07-16
| | * | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-16
| | |\ \ \ \
| | * | | | | Timeline: Disable drag-and-drop on subproperty keyframes. Better errorJon Reid2012-07-16
| | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-11
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-localJon Reid2012-07-09
| | |\ \ \ \ \ \
| | * | | | | | | Timeline: Delete unused file.Jon Reid2012-07-09
| * | | | | | | | Styling of Zoom Slider + Grid Cut off limit taken care of + Hot text Bug (lef...Kruti Shah2012-07-16
| | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Zooming the tweensKruti Shah2012-07-12
| * | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-11
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Fix layer arrayJonathan Duran2012-07-10
| | * | | | | | Fix more missing charJonathan Duran2012-07-10
| | * | | | | | Fix missing char and Temp fix missing imageJonathan Duran2012-07-10
| | | |/ / / / | | |/| | | |
| * | | | | | Adding Zoom Control to Property TracksKruti Shah2012-07-10
| * | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
| |\| | | | |
| | * | | | | remove commas from var linesJonathan Duran2012-07-09
| | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-09
| | |\| | | |
| | * | | | | Adding commentsKruti Shah2012-07-09
| | * | | | | Refactoring CodeKruti Shah2012-07-09
| | * | | | | Remove CommentKruti Shah2012-07-03
| | * | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCodeKruti Shah2012-07-03
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCodeKruti Shah2012-07-03
| | |\ \ \ \ \ \
| | * | | | | | | Refactor Code + Bug Fix for the Colorchip disappear between breadcrumb naviga...Kruti Shah2012-07-03
| | * | | | | | | Refactoring PropertyTrack.js & Span.jsKruti Shah2012-07-03
| * | | | | | | | Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-krutiKruti Shah2012-07-09
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'refs/heads/timeline-local' into TimelineUberJonathan Duran2012-07-09
| | |\ \ \ \ \ \ \
| | | * | | | | | | Timeline: First pass at cleaning up TimelineTrack code. Changes propagatedJon Reid2012-07-03