| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'FileIO-Integration' of github.com:joseeight/ninja-internal into... | hwc487 | 2012-03-09 | |
| |\| | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Clean up | Jose Antonio Marquez | 2012-03-09 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #32 from ericmueller/integration | Jose Antonio Marquez Russo | 2012-03-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | Adding missing file for webGL, still need a fix for runtime | Jose Antonio Marquez | 2012-03-09 | |
| * | | | | | | | | | | | | | | | | | | | | | | | further removal of authortime asset path replacement. | hwc487 | 2012-03-09 | |
| | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | Removed asset path replacement at authortime. | hwc487 | 2012-03-09 | |
| * | | | | | | | | | | | | | | | | | | | | | | Added asset folder replacement to runtime load. | hwc487 | 2012-03-09 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 | |
| |\| | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-03-09 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into montage-integration | Valerio Virgillito | 2012-03-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | integrating v0.7 montage into ninja | Valerio Virgillito | 2012-03-08 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Adding webGL I/O runtime functionality | Jose Antonio Marquez | 2012-03-09 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/integration' into FileIO-Integration | Jose Antonio Marquez | 2012-03-09 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | Canvas IO | hwc487 | 2012-03-08 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIO | Jose Antonio Marquez | 2012-03-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #102 from dhg637/Panels | Valerio Virgillito | 2012-03-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | Disabled State is now darker | Armen Kesablyan | 2012-03-08 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Z-Index issue of disabled state with file open dialog | Armen Kesablyan | 2012-03-08 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Disabled state for panels | Armen Kesablyan | 2012-03-07 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Reordering and resizing now works | Armen Kesablyan | 2012-03-07 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Fixed: Collapsed panels would collapse panels below | Armen Kesablyan | 2012-03-07 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Fixed Collapsing and resizing window with panels | Armen Kesablyan | 2012-03-07 | |
| | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #104 from ananyasen/integration-candidate | Valerio Virgillito | 2012-03-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing ... | Ananya Sen | 2012-03-08 | |
| | |/ / / / / / / / / / / / / / / / / / / / / | ||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge pull request #100 from imix23ways/TimelineUber | Valerio Virgillito | 2012-03-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | Timeline Bug Fix: IKNINJA-1283 | Kruti Shah | 2012-03-07 | |
| | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUber | Jonathan Duran | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Storing Hashtable for element Mapping | Kruti Shah | 2012-03-06 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Timeline:Storing HashTable for switching docs | Kruti Shah | 2012-03-06 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Fixing the layer switching | Kruti Shah | 2012-03-05 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of Bread... | Kruti Shah | 2012-03-05 | |
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUber' into Timeline-b4-latest | Kruti Shah | 2012-03-05 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NINJAmaster' into TimelineUber | Jonathan Duran | 2012-03-06 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization. | Jon Reid | 2012-03-06 | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-uber' into timeline-serialized | Jon Reid | 2012-03-06 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uber | Jon Reid | 2012-03-06 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: | Jonathan Duran | 2012-03-06 | |
| | | | | |/ / | ||||