aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
...
| * | | | | | | Revert "Revert "Cleaning up""Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opening html files… to trying to fix local build Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "Merging TextDocument into BaseDocument"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 93c8f327d662a7693d1d6ca050a0efd15ebc18ed. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "Cleaning up"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7952c5a16e2cae3fd1a459b03b9f16bba1004da. Conflicts: js/controllers/document-controller.js js/io/document/text-document.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "Reverting text/html document classes and setting up MVC folder ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure" This reverts commit 68ce64a5a2f4a71b54d33916aaf1d57161302425. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | Revert "Creating NinjaTemplate to HTML function"Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e327eccb93e2bc513fcbb7ab302783d6bce83884. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | Merge branch 'refs/heads/NinjaInternal' into ColorJose Antonio Marquez2012-02-17
|\| | | | | |
| * | | | | | Fixing the selectInput and finishing the textinputValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | Merge branch 'refs/heads/master' into componentsValerio Virgillito2012-02-16
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #50 from mencio/canvas-dataValerio Virgillito2012-02-16
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | Adding canvas data attributes
| | | * | | | | Adding a data-RDGE-id attribute to each canvas to save/load canvas dataValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | * | | | | Support for data attributes and adding a random string generatorValerio Virgillito2012-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | Fixing the preset panel undefined property for the menu model.Valerio Virgillito2012-02-16
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | 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
| | | | | | | |