aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
|\
| * Merge pull request #57 from joseeight/CloudFixValerio Virgillito2012-02-20
| |\ | | | | | | Cloud URL localStorage Fix
| | * Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| |/ | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
| * Merge pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
| |\ | | | | | | Re-adding stage mouse wheel scrolling
| * \ Merge pull request #54 from joseeight/TabPreviewValerio Virgillito2012-02-17
| |\ \ | | | | | | | | Tab preview
| | * \ Merge branch 'refs/heads/NinjaInternal' into TabPreviewJose Antonio Marquez2012-02-17
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #53 from joseeight/FileIOValerio Virgillito2012-02-17
| |\ \ \ | | | | | | | | | | File IO local files webRequest redirect
| | | * | Chrome PreviewJose Antonio Marquez2012-02-17
| | |/ /
| | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'refs/heads/stage-matrix-issue'Valerio Virgillito2012-02-17
| |\ \ \
| | * \ \ Merge pull request #52 from mencio/stage-matrix-fixValerio Virgillito2012-02-16
| | |\ \ \ | | | | | | | | | | | | Fixing the getStageWorldToGlobalMatrix bug
| | | * | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| | | | |
| | | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Adding Chrome webRequest interceptJose Antonio Marquez2012-02-17
| | | | | | | | | | | | | | | | | | | | Need to add logic to resolve file's actual URL dynamically.
| | | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | |\ \ | | | |/ / | | |/| |
| | | * | Moving Ninja iFrame templatesJose Antonio Marquez2012-02-16
| | | | |
| | | * | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | |\ \
| | | * \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | |\ \ \
| | | * \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | |\ \ \ \
| | | * | | | | Adding new RDGE library dataJose Antonio Marquez2012-02-16
| | | | | | | |
* | | | | | | | Merge branch 'nested-selection' of github.com:mencio/ninja-internal into ↵Valerio Virgillito2012-02-20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | nested-selection
| * | | | | | | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | formatting cleanupValerio Virgillito2012-02-20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | / cleanup of the breadcrumbValerio Virgillito2012-02-20
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | fixed typoValerio Virgillito2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | initial commit of the Ninja readme fileValerio Virgillito2012-02-17
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Merge pull request #51 from mencio/componentsValerio Virgillito2012-02-16
|\ \ \ \ \ | | | | | | | | | | | | Fixing the components not instantianting in the user document
| * | | | | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Fixing the component loading error.Valerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the deserializedFromTemplate which was causing the component not to load. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #50 from mencio/canvas-dataValerio Virgillito2012-02-16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding canvas data attributes
| * | | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge pull request #49 from mayhewinator/WorkingBranchmayhewinator2012-02-16
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Updated manifest.json to use our internal update server for daily builds
| * | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵John Mayhew2012-02-16
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | WorkingBranch
* | | | | | | Fixing the preset panel undefined property for the menu model.Valerio Virgillito2012-02-16
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | Merge pull request #46 from ericguzman/PresetsPanelValerio Virgillito2012-02-16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Presets panel initial merge into master
| * | | | | Presets Panel - Move to bottom, add to menuEric Guzman2012-02-16
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\ \ \ \ \
| * | | | | | Presets - Minor CSS text-shadow work-around for Windows ChromeEric Guzman2012-02-16
| | | | | | |
| * | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-16
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-16
| |\ \ \ \ \ \
| * | | | | | | Presets - Get/set active tab from local storage + other improvementsEric Guzman2012-02-15
| | | | | | | |
| * | | | | | | Presets - Modify application of preset classes for new json structureEric Guzman2012-02-15
| | | | | | | |
| * | | | | | | Presets - Modify structure of preset dataEric Guzman2012-02-15
| | | | | | | |
| * | | | | | | Presets - Add external json file with transition dataEric Guzman2012-02-15
| | | | | | | |
| * | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \ \ \ \ \ \