| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | Redo timeline resize code | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Timeline Reset to clean Master branch. Code scrub. | Jonathan Duran | 2012-02-23 | |
| | | | | | | | | | | | | | Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues. Signed-off-by: Jonathan Duran <jduran@motorola.com> | |||
| * | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials. | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵ | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d. | |||
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-02-22 | |
| |\| | ||||
| | * | Removing the timeline selection code. | Valerio Virgillito | 2012-02-20 | |
| | | | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ↵ | Nivesh Rajbhandari | 2012-02-22 | |
| | | | | | | | | | | | | | materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Updated Materials Library and Materials Editor Popup to work with latest ↵ | mqg734 | 2012-02-21 | |
| |/ | | | | | | | | version of Montage. We had to change our css to not use id's. Also, updated the popup to use Montage's Popup component. It looks like bump material has a bug. So loading that material results in a runtime error. | |||
| * | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 | |
| | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-16 | |
| |\ | ||||
| | * | Presets Panel - Move to bottom, add to menu | Eric Guzman | 2012-02-16 | |
| | | | ||||
| | * | Presets - Minor CSS text-shadow work-around for Windows Chrome | Eric Guzman | 2012-02-16 | |
| | | | ||||
| | * | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-16 | |
| | |\ | ||||
| | | * | CSSPanel - fix code indentation | Eric Guzman | 2012-02-16 | |
| | | | | ||||
| | | * | CSS Panel - Add Resizer to sub panels | Eric Guzman | 2012-02-16 | |
| | | | | ||||
| | * | | Merge branch 'refs/heads/TreeComponents' into PresetsPanel | Eric Guzman | 2012-02-16 | |
| | |\| | ||||
| | * | | Presets - Get/set active tab from local storage + other improvements | Eric Guzman | 2012-02-15 | |
| | | | | ||||
| | * | | Presets - Modify application of preset classes for new json structure | Eric Guzman | 2012-02-15 | |
| | | | | ||||
| | * | | Presets - Modify structure of preset data | Eric Guzman | 2012-02-15 | |
| | | | | ||||
| | * | | Presets - Add external json file with transition data | Eric Guzman | 2012-02-15 | |
| | | | | ||||
| | * | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-13 | |
| | |\ \ | ||||
| | * | | | Style Presets - Separate out the style preset data to new file | Eric Guzman | 2012-02-13 | |
| | | | | | ||||
| | * | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-13 | |
| | |\ \ \ | ||||
| | * | | | | Presets - Committing half-baked drag and drop | Eric Guzman | 2012-02-13 | |
| | | | | | | ||||
| | * | | | | Presets - fixed some object naming and css for presets tree | Eric Guzman | 2012-02-08 | |
| | | | | | | ||||
| | * | | | | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-08 | |
| | |\ \ \ \ | ||||
| | * | | | | | Presets Panel - Initial commit with panel content | Eric Guzman | 2012-02-07 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||
| | * | | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into ↵ | Valerio Virgillito | 2012-02-14 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: js/io/document/html-document.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||
| | * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-13 | |
| | |\ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-11 | |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html | |||
| | * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | |||
| | * | | | | | | | | disabling the auto open of a document on load. Temporary using the new ↵ | Valerio Virgillito | 2012-02-09 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project button to open a document. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-09 | |
| | |\ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-08 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-06 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||
| | * | | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-02 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-30 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Stage.scss | |||
| | * | | | | | | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 | |
| | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | Adding more components pi | Valerio Virgillito | 2012-02-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rest of the components pi. Missing text-input and select Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | | Adding the button and the dropdown control. | Valerio Virgillito | 2012-02-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | | Completing the anchor element | Valerio Virgillito | 2012-02-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | | Adding all the components to the panel | Valerio Virgillito | 2012-02-14 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | Add support for drag and drop for the components. | Valerio Virgillito | 2012-02-14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-13 | |
| |\ \ \ \ \ \ | ||||