Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'refs/heads/master' into StylesControllerUpdates | Eric Guzman | 2012-02-20 |
|\ | |||
| * | Cloud URL localStorage Fix | Jose Antonio Marquez | 2012-02-20 |
| | | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load. | ||
* | | Merge branch 'StylesControllerUpdates' of ↵ | Eric Guzman | 2012-02-20 |
|\ \ | | | | | | | | | | github.com:ericguzman/ninja-internal into StylesControllerUpdates | ||
| * | | Styles controller - Check for element's window object before querying for ↵ | Eric Guzman | 2012-02-20 |
| |/ | | | | | | | matching css rules. | ||
* / | Styles Controller -Fix invalid variable reference when looking for element's ↵ | Eric Guzman | 2012-02-20 |
|/ | | | | window object | ||
* | Merge pull request #55 from mencio/nested-selection | Valerio Virgillito | 2012-02-17 |
|\ | | | | | Re-adding stage mouse wheel scrolling | ||
| * | Re-adding stage mouse wheel scrolling | Valerio Virgillito | 2012-02-17 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Chrome Preview | Jose Antonio Marquez | 2012-02-17 |
| | | |||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-17 |
|\ \ | |||
| * | | Fixing the getStageWorldToGlobalMatrix bug | Valerio Virgillito | 2012-02-16 |
| |/ | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Adding webRequest redirects for iFrame templates | Jose Antonio Marquez | 2012-02-17 |
| | | |||
* | | Adding Chrome webRequest intercept | Jose Antonio Marquez | 2012-02-17 |
| | | | | | | | | Need to add logic to resolve file's actual URL dynamically. | ||
* | | Merge branch 'refs/heads/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-16 |
|\| | |||
| * | 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 |
| |\ | |||
| | * | Merge pull request #50 from mencio/canvas-data | Valerio Virgillito | 2012-02-16 |
| | |\ | | | | | | | | | Adding canvas data attributes | ||
| | | * | Adding a data-RDGE-id attribute to each canvas to save/load canvas data | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | Support for data attributes and adding a random string generator | Valerio Virgillito | 2012-02-16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | Merge branch 'refs/heads/master' into components | Valerio Virgillito | 2012-02-15 |
| |\ \ \ | |||
| * | | | | 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> | ||
| * | | | | fixing the controller to handle all properties | Valerio Virgillito | 2012-02-14 |
| | | | | | | | | | | | | | | | | | | | | 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> | ||
| * | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |