| Commit message (Expand) | Author | Age |
... | |
* | | | Merge branch 'refs/heads/Timeline-local' into TimelineUber | Jonathan Duran | 2012-03-01 |
|\ \ \
| |_|/
|/| | |
|
| * | | Timeline: Merge arrlayers and arrtracks into one object. | Jon Reid | 2012-03-01 |
* | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-03-01 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge branch 'refs/heads/master' into stage-fixes | Valerio Virgillito | 2012-03-01 |
| |\ |
|
| | * | Squashed commit of the workspace-bugs | Valerio Virgillito | 2012-03-01 |
| * | | stage and elements fixes | Valerio Virgillito | 2012-03-01 |
| |/ |
|
| * | Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-in... | Valerio Virgillito | 2012-02-29 |
| |\ |
|
| * \ | Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into i... | Valerio Virgillito | 2012-02-29 |
| |\ \ |
|
| | * | | We need to remove color buttons from the color model when updating the PI for... | Nivesh Rajbhandari | 2012-02-28 |
| * | | | putting the color panel on top when opening ninja | Valerio Virgillito | 2012-02-28 |
| * | | | minor fix for handling selections on switch document | Ananya Sen | 2012-02-28 |
| * | | | persist selections while switching documents | Ananya Sen | 2012-02-28 |
* | | | | Merge branch 'Timeline-main' into Timeline-local | Jon Reid | 2012-03-01 |
|\ \ \ \ |
|
| * | | | | Set doc dirty flag when adding tweens or modifying animations | Jonathan Duran | 2012-03-01 |
| * | | | | Update master track on duration change instead of tween add. | Jonathan Duran | 2012-03-01 |
| * | | | | Timeline: Track Duration Fix | Jonathan Duran | 2012-03-01 |
* | | | | | Timeline: efficiency improvements to collapser. Document switching. | Jon Reid | 2012-03-01 |
* | | | | | Timeline: Merge. Set collapser heights. | Jon Reid | 2012-03-01 |
* | | | | | Merge branch 'Timeline-main' into Timeline-newdoc | Jon Reid | 2012-03-01 |
|\| | | | |
|
| * | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-29 |
| * | | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti... | Jonathan Duran | 2012-02-29 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Timeline:Revert back to earlier code | Kruti Shah | 2012-02-29 |
| | * | | | TImeline: Cleanup | Kruti Shah | 2012-02-29 |
| | * | | | Timeline: Changed the variables names to resolve issues.And removed the alert. | Kruti Shah | 2012-02-29 |
| * | | | | Squashed commit of the following: | Jonathan Duran | 2012-02-29 |
| |/ / / |
|
* | | | | Timeline: Document switching and code restructuring. | Jon Reid | 2012-03-01 |
* | | | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc | Jon Reid | 2012-02-29 |
|\| | | |
|
| * | | | Merge branch 'Timeline-b2-latest' of github.com:ntfx47/ninja-internal into Ti... | Jonathan Duran | 2012-02-29 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Timeline: Fix Selection , Partially Fix adding element to an already animated... | Kruti Shah | 2012-02-28 |
* | | | | Timeline: document switching + new document. | Jon Reid | 2012-02-29 |
|/ / / |
|
* | | | Merge branch 'refs/heads/NINJAmaster' into Timeline | Jonathan Duran | 2012-02-28 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Fix for double clicking in the resizer | Valerio Virgillito | 2012-02-27 |
* | | Timeline : Deleting Layer deletes the element, Deleting Layer selects another... | Jonathan Duran | 2012-02-28 |
* | | Fix element selection on open doc | Jonathan Duran | 2012-02-28 |
* | | Timeline: Basic document switching. | Jon Reid | 2012-02-28 |
* | | Fix to animation names to support multiclassed elements | Jonathan Duran | 2012-02-28 |
* | | remove comment | Jonathan Duran | 2012-02-28 |
* | | todo note | Jonathan Duran | 2012-02-28 |
* | | Fix re-reopened animation duration and milliseconds | Jonathan Duran | 2012-02-28 |
* | | Timeline: Successfully unbind event listeners in tweens when clearing timeline. | Jon Reid | 2012-02-27 |
* | | Timeline: try to clean up bogus events manually. | Jon Reid | 2012-02-27 |
* | | Timeline: More work on clear timeline method. | Jon Reid | 2012-02-27 |
* | | Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local | Jon Reid | 2012-02-27 |
|\| |
|
| * | Timeline : Reopening Doc has layer 1 default fix | Jonathan Duran | 2012-02-27 |
| * | Timeline: RetrieveStoredTweens calling fixed | Jonathan Duran | 2012-02-27 |
| * | Merge branch 'refs/heads/integration-candidate' into Timeline | Jonathan Duran | 2012-02-27 |
| |\ |
|
| | * | removing the old settings class and disabling panel settings until the new pa... | Valerio Virgillito | 2012-02-24 |
| | * | clearing the old local setting and using the new version/prefix local settings. | Valerio Virgillito | 2012-02-24 |
| | * | prefixing the local storage and using the new local-storage object. | Valerio Virgillito | 2012-02-24 |
| | * | Merge branch 'refs/heads/master' into local-storage-version | Valerio Virgillito | 2012-02-24 |
| | |\ |
|