Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | | | | | | Removing the old and obsolete ninja 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-14 | |
| | | |\ \ \ \ \ \ | ||||
| | | | | | * | | | | Moving Ninja iFrame templates | Jose Antonio Marquez | 2012-02-16 | |
| | | | | | | | | | | ||||
| | | | | | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 | |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Fixing the preset panel undefined property for the menu model. | Valerio Virgillito | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | | | * | | | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 | |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #46 from ericguzman/PresetsPanel | Valerio Virgillito | 2012-02-16 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Presets panel initial merge into master | |||
| * | | | | | | | | | | Presets Panel - Move to bottom, add to menu | Eric Guzman | 2012-02-16 | |
| | | | | | | | | | | | ||||
| * | | | | | | | | | | Merge branch 'refs/heads/master' into PresetsPanel | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||
| * | | | | | | | | | | | 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/TreeComponents' into PresetsPanel | 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 | |
| | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | Eric Guzman | 2012-02-08 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PresetsPanel | |||
| * | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'refs/heads/master' into PresetsPanel | Eric Guzman | 2012-02-07 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | Presets Panel - Initial commit with panel content | Eric Guzman | 2012-02-07 | |
| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Styles Controller - Add some methods for modifying css keyframe rules | Eric Guzman | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Styles Controller - Correct author attribution for specificity calculation | Eric Guzman | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | Styles Controller - Add code to remove cache items from history (not just ↵ | Eric Guzman | 2012-02-06 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullifying them) | |||
| * | | | | | | | | | | | | | | | | | | Styles Controller - First stab at group styling | Eric Guzman | 2012-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 FileIO | Jose Antonio Marquez | 2012-02-16 | |
| | | | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #48 from joseeight/Cloud | Valerio Virgillito | 2012-02-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloud download windows bug fix | |||
| * | | | | | | | | | | | | | | | | | | | Cloud download windows bug fix | Jose Antonio Marquez | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal | Valerio Virgillito | 2012-02-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Removed old references in gitignore | Valerio Virgillito | 2012-02-16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
* | | | | | | | | | | | | | | | | | | |