Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | * | | | | | | | fixing logical error which was a side-effect of SHA:819348eaf3ff6b4a8c38ecca7... | Ananya Sen | 2012-07-20 | |
| | | | * | | | | | | | copy/paste from external apps - removed unnecessary selection change to fix P... | Ananya Sen | 2012-07-19 | |
| | | | | | | | | * | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 | |
| | | | | | | | | |\ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||
| | | * | | | | | | | | Merge branch 'timeline-play' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-19 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||
| | | | * | | | | | | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outline | Valerio Virgillito | 2012-07-19 | |
| | | | |/ / / / / / | ||||
| | | * | | | | | | | Merge branch 'RadialBlur' of https://github.com/ericmueller/ninja | Valerio Virgillito | 2012-07-19 | |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | ||||
| | | | * | | | | | | Renamed Raiders material to Dark Blur, and Paris to Blue Sky. | hwc487 | 2012-07-19 | |
| | | | * | | | | | | Re-added Radial Blur and Raiders materials | hwc487 | 2012-07-19 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||
| | | * | | | | | | Squashed commit of the following: | Nivesh Rajbhandari | 2012-07-19 | |
| |_|/ / / / / / |/| | | | | | | | ||||
* | | | | | | | | Fixing chrome preview shortcut | Valerio Virgillito | 2012-07-18 | |
| | | | | | * | | Merge pull request #43 from mencio/Document | Jose Antonio Marquez Russo | 2012-07-18 | |
| | | | | | |\ \ | ||||
| | | | | | | * | | Preview button: enabling the entire button to handle a mouse click | Valerio Virgillito | 2012-07-18 | |
| | | | | | |/ / | ||||
| | | | | | * | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-18 | |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | ||||
* | | | | | | | | Merge branch 'menu-fixes' of https://github.com/mencio/ninja | Valerio Virgillito | 2012-07-18 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | fixed highlight of file icons and grid menu | Valerio Virgillito | 2012-07-18 | |
| * | | | | | | | | fixed more menu bugs | Valerio Virgillito | 2012-07-18 | |
| * | | | | | | | | Fixed some issues with the menu-fixes | Valerio Virgillito | 2012-07-18 | |
| * | | | | | | | | Merge branch 'refs/heads/master' into menu-fixes | Valerio Virgillito | 2012-07-18 | |
| |\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | adding a missing semicolon | Valerio Virgillito | 2012-07-18 | |
| * | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ |