aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Clean upJose Antonio Marquez2012-03-09
|
* Merge pull request #32 from ericmueller/integrationJose Antonio Marquez Russo2012-03-09
|\ | | | | Added asset folder replacement to runtime load.
| * Removed asset path replacement at authortime.hwc4872012-03-09
| |
| * Added asset folder replacement to runtime load.hwc4872012-03-09
| |
* | Adding missing file for webGL, still need a fix for runtimeJose Antonio Marquez2012-03-09
|/
* Merge branch 'refs/heads/Ninja-Internal' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-03-09
| |\
| * \ Merge branch 'refs/heads/master' into montage-integrationValerio Virgillito2012-03-08
| |\ \
| * | | integrating v0.7 montage into ninjaValerio Virgillito2012-03-08
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Adding webGL I/O runtime functionalityJose Antonio Marquez2012-03-09
| | | | | | | | | | | | | | | | There is a problem that needs to be resolved in the CanvasRuntime.
* | | | Merge branch 'refs/heads/integration' into FileIO-IntegrationJose Antonio Marquez2012-03-09
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js
| * | | | Canvas IOhwc4872012-03-08
| | | | |
* | | | | Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-03-08
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
| * | | | Merge pull request #102 from dhg637/PanelsValerio Virgillito2012-03-08
| |\ \ \ \ | | |_|_|/ | |/| | | Fixed Some Calculation issues and bugs & appended disabled state when no documents exist
| | * | | Disabled State is now darkerArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Z-Index issue of disabled state with file open dialogArmen Kesablyan2012-03-08
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Disabled state for panelsArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Reordering and resizing now worksArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Fixed: Collapsed panels would collapse panels belowArmen Kesablyan2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | * | | Fixed Collapsing and resizing window with panelsArmen Kesablyan2012-03-07
| | | |/ | | |/| | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | Merge pull request #104 from ananyasen/integration-candidateValerio Virgillito2012-03-08
| |\ \ \ | | | | | | | | | | IKNINJA-1270: fixed browser crashing when you close a document while playing a video
| | * | | IKNINJA-1270: fixed browser crashing when you close a document while playing ↵Ananya Sen2012-03-08
| |/ / / | | | | | | | | | | | | | | | | | | | | a video Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge pull request #100 from imix23ways/TimelineUberValerio Virgillito2012-03-08
| |\ \ \ | | | | | | | | | | Timeline uber
| | * | | Timeline Bug Fix: IKNINJA-1283Kruti Shah2012-03-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | * | | Merge branch 'refs/heads/Timeline-b4-latest' into TimelineUberJonathan Duran2012-03-06
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | * | | Timeline: Storing Hashtable for element MappingKruti Shah2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | Timeline:Storing HashTable for switching docsKruti Shah2012-03-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | Timeline: Fixing the layer switchingKruti Shah2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | Timeline: Removing Events for Adding and Deleting Layer, Taking care of ↵Kruti Shah2012-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BreadCrumb Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| | | * | | 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
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |