Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Added all materials back in | hwc487 | 2012-02-22 |
* | Updated Materials Library and Materials Editor Popup to work with latest vers... | mqg734 | 2012-02-21 |
* | Fixing the selectInput and finishing the textinput | Valerio Virgillito | 2012-02-16 |
* | 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 in... | Valerio Virgillito | 2012-02-14 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
| |\ \ \ \ \ \ \ | |||
| * | | | | | | | | disabling the auto open of a document on load. Temporary using the new projec... | Valerio Virgillito | 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-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 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-01-30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
* | | | | | | | | | | | | | | Adding more components pi | Valerio Virgillito | 2012-02-15 |
* | | | | | | | | | | | | | | Adding the button and the dropdown control. | Valerio Virgillito | 2012-02-15 |
* | | | | | | | | | | | | | | Completing the anchor element | Valerio Virgillito | 2012-02-14 |
* | | | | | | | | | | | | | | Adding all the components to the panel | Valerio Virgillito | 2012-02-14 |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Add support for drag and drop for the components. | Valerio Virgillito | 2012-02-14 |
* | | | | | | | | | | | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-color | Valerio Virgillito | 2012-02-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||
| | * | | | | | | | | | | | Bug Fixes | Jose Antonio Marquez | 2012-02-13 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||
| * | | | | | | | | | | | Cleaning up the stage background color chip. | Valerio Virgillito | 2012-02-13 |
| * | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into sta... | Valerio Virgillito | 2012-02-12 |
| |\| | | | | | | | | | | |||
| | * | | | | | | | | | | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-02-10 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into fea... | Valerio Virgillito | 2012-02-09 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into tex... | Armen Kesablyan | 2012-02-07 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | | | |||
| | | | * | | | | | | | | | Initial Text Tool Implementation | Armen Kesablyan | 2012-02-02 |
| | | | | |/ / / / / / / | | | | |/| | | | | | | |