aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'refs/heads/master' into fixes_7.1Eric Guzman2012-07-20
|\
| * Merge branch 'timeline-play' of https://github.com/mencio/ninjaValerio Virgillito2012-07-19
| |\
| | * Timeline: updated livePreview to timeline play. Hide canvas and draw red outlineValerio Virgillito2012-07-19
| * | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninjaValerio Virgillito2012-07-19
| |\ \ | | |/ | |/|
| | * Renamed Raiders material to Dark Blur, and Paris to Blue Sky.hwc4872012-07-19
| | * Re-added Radial Blur and Raiders materialshwc4872012-07-19
| * | Squashed commit of the following:Nivesh Rajbhandari2012-07-19
| |/
| * Fixing chrome preview shortcutValerio Virgillito2012-07-18
| * Merge branch 'menu-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-07-18
| |\
| | * fixed highlight of file icons and grid menuValerio Virgillito2012-07-18
| | * fixed more menu bugsValerio Virgillito2012-07-18
| | * Fixed some issues with the menu-fixesValerio Virgillito2012-07-18
| | * Merge branch 'refs/heads/master' into menu-fixesValerio Virgillito2012-07-18
| | |\
| | * | adding a missing semicolonValerio Virgillito2012-07-18
| | * | resolved a bad merge while removing comments.Valerio Virgillito2012-07-17
| | * | Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixesValerio Virgillito2012-07-17
| | |\ \
| | | * | menu design update and bug fixes - Moved Preview to the document barValerio Virgillito2012-07-17
| | * | | removed left over comments.Valerio Virgillito2012-07-17
| | |/ /
| * | | Merge branch 'Tracking' of https://github.com/joseeight/ninjaValerio Virgillito2012-07-18
| |\ \ \
| | * \ \ Merge branch 'refs/heads/Ninja-Master' into TrackingJose Antonio Marquez2012-07-18
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fix: Improved download UX for cloud appJose Antonio Marquez2012-07-18
| * | | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 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