| Commit message (Expand) | Author | Age |
* | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
|\ |
|
| * | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-20 |
| |\ |
|
| | * | If no material was defined, use Flat material when switching from 2d to WebGL... | Nivesh Rajbhandari | 2012-07-20 |
| | * | IKNINJA-1780 - [Shape] Error when opening document that contains a shape with... | Nivesh Rajbhandari | 2012-07-19 |
| | * | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action. | Nivesh Rajbhandari | 2012-07-19 |
| | * | IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding pa... | Nivesh Rajbhandari | 2012-07-19 |
| | * | Restrict materials popup to appear within our page. | Nivesh Rajbhandari | 2012-07-19 |
| * | | Binding view: fixed mouse move event outside the hud | Valerio Virgillito | 2012-07-20 |
* | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-20 |
|\| | |
|
| * | | Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix | Ananya Sen | 2012-07-20 |
| |\ \ |
|
| * | | | 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 |
* | | 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 |
* | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-18 |
|\| | | | |
|
| * | | | | fixing the copyrights on the timeline branch pull request. | 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 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 |
| | |\ \ \ \
| | | | |_|/
| | | |/| | |
|