aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/SerialKiller' into TimelineUberJonathan Duran2012-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following:Jonathan Duran2012-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fixes for layer numbering problem, document switching events.Jon Reid2012-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-kruti/SerialKiller-branch1' into Timeline...Jon Reid2012-03-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline : Changing the order of the arrLayers being builtKruti Shah2012-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'ninja-jduran/SerialKiller' into Timeline-localJon Reid2012-03-08
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary needsDraw callsJonathan Duran2012-03-08
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'Timeline-serialkiller' into Timeline-localJon Reid2012-03-07
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanupJonathan Duran2012-03-07
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Bigfixes and cleanup from optimizationJonathan Duran2012-03-07
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfixes from optimizationJonathan Duran2012-03-07
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize Timeline serializationJonathan Duran2012-03-07
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize serialization bindings for Tween componentJonathan Duran2012-03-07
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Bug fix: IKNINJA-1283 When a second document is open and closed, t...Jon Reid2012-03-07
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Fixing the layer switchingKruti Shah2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of Bread...Kruti Shah2012-03-05
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/TimelineUber' into Timeline-b4-latestKruti Shah2012-03-05
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-03-06
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-06
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #98 from mencio/panelsValerio Virgillito2012-03-06
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding drag and dropValerio Virgillito2012-03-05
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove console logValerio Virgillito2012-03-05
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
| | | | | | |_|_|_|_|_|_|_|_|_|/ / / / /