Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'Fixes_071' of https://github.com/mqg734/ninja into v0.7.1 | Valerio Virgillito | 2012-07-20 |
|\ | |||
| * | IKNINJA-1899 - Fixed runtime error when undoing a delete shape action. | Nivesh Rajbhandari | 2012-07-19 |
* | | Timeline: updated livePreview to timeline play. Hide canvas and draw red outline | Valerio Virgillito | 2012-07-19 |
|/ | |||
* | Fixing chrome preview shortcut | Valerio Virgillito | 2012-07-18 |
* | Fixed copy paste from external applications | Ananya Sen | 2012-07-16 |
* | BSD License | Kris Kowal | 2012-07-09 |
* | Remove trailing spaces | Kris Kowal | 2012-07-06 |
* | Expand tabs | Kris Kowal | 2012-07-06 |
* | Update copyright boilerplate | Kris Kowal | 2012-07-06 |
* | Merge pull request #338 from mencio/IKNINJA-1615 | Valerio Virgillito | 2012-06-26 |
|\ | |||
| * | Fix for IKNINJA-1615: Enable mouse up event on top of the user document scrol... | Valerio Virgillito | 2012-06-25 |
* | | Merge branch 'refs/heads/NINJAmaster' into timeline-deletekeyframefix | Jonathan Duran | 2012-06-22 |
|\| | |||
| * | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-21 |
| |\ | |||
| * | | - added io api to generate file from binary | Ananya Sen | 2012-06-21 |
| * | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-19 |
| |\ \ | |||
| * | | | - Eric Guzman's styles-controller fix for relatively positioned | Ananya Sen | 2012-06-13 |
| * | | | Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste | Ananya Sen | 2012-06-08 |
| |\ \ \ | |||
| * | | | | - fixed multiple paste displacement | Ananya Sen | 2012-06-08 |
* | | | | | FIx - can't delete keyframes | Jonathan Duran | 2012-06-22 |
| |_|_|/ |/| | | | |||
* | | | | remove unneeded files | Jonathan Duran | 2012-06-20 |
* | | | | Timeline: Re-enable drag-and-drop of layers, now with bonus DOM | Jon Reid | 2012-06-19 |
* | | | | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-19 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-14 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-13 |
| |\ \ \ \ | |||
| * | | | | | Removed references to NJUtils | hwc487 | 2012-06-12 |
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-12 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-05 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-06-04 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-31 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-17 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Tex... | hwc487 | 2012-05-11 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Update materials to the new texture model. | hwc487 | 2012-04-26 |
* | | | | | | | | | | | | Merge remote-tracking branch 'ninja-internal/master' into test-merge | Jon Reid | 2012-06-15 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #300 from mqg734/IKNinja_1715 | Valerio Virgillito | 2012-06-13 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | IKNinja-1715 - GIO: canvas tag is not saved after switching WebGL option On/O... | Nivesh Rajbhandari | 2012-06-13 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-11 |
| |\| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into montage-v10-integration | Valerio Virgillito | 2012-06-06 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | first iteration of adding serializable to ninja plus other changes to run the... | Valerio Virgillito | 2012-06-06 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | F6 support for keyframes | Jonathan Duran | 2012-06-15 |
* | | | | | | | | | | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUber | Kruti Shah | 2012-06-12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-06-11 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-06-07 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-06 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into element-model-fixes | Valerio Virgillito | 2012-06-05 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | | removing all model creators. | Valerio Virgillito | 2012-06-05 |
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | Adding unique ID to canvas data folders | Jose Antonio Marquez | 2012-06-07 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #272 from pushkarjoshi/pentool | Valerio Virgillito | 2012-06-06 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-05 |
| | | |\| | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-06-04 |
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | |