aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
|\
| * Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\
| | * Disabled State is now darkerArmen Kesablyan2012-03-08
| | * Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | * Disabled state for panelsArmen Kesablyan2012-03-07
| | * Reordering and resizing now worksArmen Kesablyan2012-03-07
| | * Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | * Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
* | | Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
|\| |
| * | Merge pull request #104 from ananyasen/integration-candidateValerio Virgillito2012-03-08
| |\ \
| | * | IKNINJA-1270: fixed browser crashing when you close a document while playing ...Ananya Sen2012-03-08
| |/ /
| * | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| |\ \
| | * | 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
| | | | |\ \ \ \
| | * | | | | | | Timeline: Code cleanup. Fix bug with unfound property in serialization.Jon Reid2012-03-06
| | * | | | | | | Merge branch 'Timeline-uber' into timeline-serializedJon Reid2012-03-06
| | |\| | | | | |
| | | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-06
| | | |\ \ \ \ \ \
| | | | * | | | | | Squashed commit of the following:Jonathan Duran2012-03-06
| | | | |/ / / / /
| | | | * | | / / Timeline Fix for layer/element selectionJonathan Duran2012-03-06
| | | | | |_|/ / | | | | |/| | |
| | | * | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-uberJon Reid2012-03-02
| | | |\| | | |
| | * | | | | | Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-serial...Jon Reid2012-03-02
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Support writing and reading of animation duration with millsecondsJonathan Duran2012-03-02
| | | * | | | | Timeline Fix timing functionJonathan Duran2012-03-02
| | | * | | | | Timeline: Fix for animation iteration countJonathan Duran2012-03-02
| | | | |_|/ / | | | |/| | |
| | * | | | | Timeline: Serialization of all Collapser componentsJon Reid2012-03-02
| | | |/ / / | | |/| | |
| | * | | | Timeline: Fix TODOs for consolidating repetition objects.Jon Reid2012-03-02
| | |/ / /
| | * | | Remove console logJonathan Duran2012-03-02
| | * | | CleanupJonathan Duran2012-03-02
| | * | | Start looping over tweened properties genericallyJonathan Duran2012-03-02
| | * | | Timeline bug fixes and cleanupJonathan Duran2012-03-01
| | * | | Fix for selection change event handlerJonathan Duran2012-03-01
| | * | | Merge branch 'refs/heads/Timeline-local' into TimelineUberJonathan Duran2012-03-01
| | |\ \ \
| | | * | | Timeline: Merge arrlayers and arrtracks into one object.Jon Reid2012-03-01
| * | | | | Merge pull request #103 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-07
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Image data fix on OpenJose Antonio Marquez2012-03-07
| | * | | | Adding To-do comments for CDN stylesheetsJose Antonio Marquez2012-03-07
| | * | | | Removing temp viewing of CDN stylesJose Antonio Marquez2012-03-07
| |/ / / /
* / / / / integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
|/ / / /
* | | | Merge pull request #99 from joseeight/FileIO-Build-CandidateValerio Virgillito2012-03-06
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'refs/heads/FileIO' into FileIO-Build-CandidateJose Antonio Marquez2012-03-06
| |\ \ \
| | * | | Adding CDN support for URLs in linked CSSJose Antonio Marquez2012-03-06
| | * | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-06
| | |\ \ \ | |_|/ / / |/| | | |