aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| | | | * | | | | | | | | Timeline: Change serialization parameters for some component properties.Jon Reid2012-04-30
| | | | | | | | | | | | |
| | | | * | | | | | | | | Timeline: Replace id with data-montage-id in all reels.Jon Reid2012-04-27
| | | | | | | | | | | | |
| | * | | | | | | | | | | minor formattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | | | | | | | | Merge branch 'Master-Dom-Manipulation' of ↵Valerio Virgillito2012-05-03
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | https://github.com/ntfx47/ninja-internal
| | | * | | | | | | | | | Dom ManipulationKruti Shah2012-05-03
| | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | | | | | | | | | | Merge pull request #190 from ananyasen/master-data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | use data-montage-id instead of id in template
| | * | | | | | | | | | | use data-montage-id instead of id in templateAnanya Sen2012-05-03
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | | | | | | Merge branch 'Color' of https://github.com/joseeight/ninja-internal into data-idValerio Virgillito2012-05-03
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Changing ID to Montage-ID for Color PanelJose Antonio Marquez2012-05-03
| | | | | | | | | | | | |
| | * | | | | | | | | | | Changing ID to Montage-ID for Color ComponentsJose Antonio Marquez2012-05-03
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'refs/heads/master' into data-idValerio Virgillito2012-05-03
| |\| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #183 from mqg734/data-idValerio Virgillito2012-04-30
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Updating id to data-montage-id.
| | * | | | | | | | | | | Updating id to data-montage-id (and associated CSS, if necessary) in some of ↵Nivesh Rajbhandari2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | | | fixing the menu and tool propertiesValerio Virgillito2012-04-30
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | / / / / / / / converting the layout folder to use data-montage-idValerio Virgillito2012-04-30
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | | | | | | | Computed Style Panel - Add data-montage idsEric Guzman2012-05-10
| | | | | | | | | | |
* | | | | | | | | | | Style Declaration - Improved updating of styles using binding.Eric Guzman2012-05-10
| | | | | | | | | | |
* | | | | | | | | | | CSS Panel - Rule List refactorEric Guzman2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved adding, updating, and sorting of rules in rule list.
* | | | | | | | | | | Styles Controller - Added fix for setting style on cached, multi-target rule.Eric Guzman2012-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fix for setting style on cached, multi-target rule. Also added parameter to selector override to augment specificity of selector
* | | | | | | | | | | CSS Panel - Added update of new rules to rule listEric Guzman2012-05-08
| | | | | | | | | | |
* | | | | | | | | | | CSS Panel - Create non-tree declaration (optimized). And add updating ↵Eric Guzman2012-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality.
* | | | | | | | | | | Style sheets - Added default stylesheet selectionEric Guzman2012-05-08
| | | | | | | | | | |
* | | | | | | | | | | Style sheets - Add sheet actionEric Guzman2012-05-07
| | | | | | | | | | |
* | | | | | | | | | | CSS Panel - Add labels for selection and document namesEric Guzman2012-05-03
| | | | | | | | | | |
* | | | | | | | | | | Styles delegate - Clean upEric Guzman2012-05-03
| | | | | | | | | | |
* | | | | | | | | | | Style sheets - Add stub for add stylesheet buttonEric Guzman2012-05-03
| | | | | | | | | | |
* | | | | | | | | | | CSS Panel - Support showing computed stylesEric Guzman2012-05-03
| | | | | | | | | | |
* | | | | | | | | | | Panel Toolbar - Support hiding and showing of buttonsEric Guzman2012-05-03
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-02
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #186 from mqg734/StageWebTemplateValerio Virgillito2012-05-02
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | More grid drawing fixes for new web template workflow. Also, adding back ability to draw when working plane changes.
| | * | | | | | | | | Support drawing in side and top view. Also, adding back support for drawing ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shapes inside canvas when double-clicked into canvas or when moused over canvas. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Draw a red outline around the stage for reference when rotating stage.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | | | | | | | Offset side and top working planes by half the stage width/height.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | | | | | Merge pull request #184 from mqg734/StageWebTemplateValerio Virgillito2012-05-01
| |\| | | | | | | | | | | |_|/ / / / / / / | |/| | | | | | | | Get working plane grid to draw for new stage web template workflow.
| | * | | | | | | | webTemplate var gets reset to false, so must check for new stage template ↵Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | | | |