aboutsummaryrefslogtreecommitdiff
path: root/js/panels
Commit message (Expand)AuthorAge
...
| * | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| * | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ...Nivesh Rajbhandari2012-02-22
| * | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\|
| * | Integrating canvas-2d drawing and WebGL fixes, including adding back WebGL ma...Nivesh Rajbhandari2012-02-22
| * | Updated Materials Library and Materials Editor Popup to work with latest vers...mqg7342012-02-21
* | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-22
|\ \ \ | | |/ | |/|
| * | Removing the timeline selection code.Valerio Virgillito2012-02-20
| |/
* | CSS Panel UpdateEric Guzman2012-02-22
* | CSS Panel Update - Adding montage objects for css panelEric Guzman2012-02-22
|/
* Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
* Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
|\
| * Presets Panel - Move to bottom, add to menuEric 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
| |\
| | * CSSPanel - fix code indentationEric Guzman2012-02-16
| | * CSS Panel - Add Resizer to sub panelsEric 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
| |\ \
| * | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
| * | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \ \
| * | | | Presets - Committing half-baked drag and dropEric Guzman2012-02-13
| * | | | Presets - fixed some object naming and css for presets treeEric Guzman2012-02-08
| * | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-08
| |\ \ \ \
| * | | | | Presets Panel - Initial commit with panel contentEric Guzman2012-02-07
* | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-15
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'components' of https://github.com/mencio/ninja-internal into in...Valerio Virgillito2012-02-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-11
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
| |\ \ \ \ \ \ \
| * | | | | | | | disabling the auto open of a document on load. Temporary using the new projec...Valerio Virgillito2012-02-09
| * | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-09
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-01-30
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merged old FileIOJose Antonio Marquez2012-01-27
* | | | | | | | | | | | | | Adding more components piValerio Virgillito2012-02-15
* | | | | | | | | | | | | | Adding the button and the dropdown control.Valerio Virgillito2012-02-15
* | | | | | | | | | | | | | Completing the anchor elementValerio Virgillito2012-02-14
* | | | | | | | | | | | | | Adding all the components to the panelValerio Virgillito2012-02-14
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Add support for drag and drop for the components.Valerio Virgillito2012-02-14
* | | | | | | | | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'refs/heads/master' into stage-colorValerio Virgillito2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |