aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | | | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | | | | |\ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Style Presets - Separate out the style preset data to new fileEric Guzman2012-02-13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'refs/heads/TreeComponents' into PresetsPanelEric Guzman2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Presets - Committing half-baked drag and dropEric Guzman2012-02-13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Eric Guzman2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PresetsPanel
| * | | | | | | | | | | | | | | | Presets - fixed some object naming and css for presets treeEric Guzman2012-02-08
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into PresetsPanelEric Guzman2012-02-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Presets Panel - Initial commit with panel contentEric Guzman2012-02-07
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Styles Controller - Add some methods for modifying css keyframe rulesEric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Styles Controller - Correct author attribution for specificity calculationEric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Styles Controller - Add code to remove cache items from history (not just ↵Eric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullifying them)
| * | | | | | | | | | | | | | | | | | Styles Controller - First stab at group stylingEric Guzman2012-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split "createOverrideRule" into two methods --> now has createOverrideSelector. Also took first stab at creating a group style.
| | | | | | | | | | | | | | | * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-16
| | | | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #48 from joseeight/CloudValerio Virgillito2012-02-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud download windows bug fix
| * | | | | | | | | | | | | | | | | | | Cloud download windows bug fixJose Antonio Marquez2012-02-16
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalValerio Virgillito2012-02-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Removed old references in gitignoreValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | | | | | | | | | | Fixed the stage scroll by hiding the rulers.Valerio Virgillito2012-02-16
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | | | | | | | | | | | | * | | | Adding new RDGE library dataJose Antonio Marquez2012-02-16
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/