aboutsummaryrefslogtreecommitdiff
path: root/js/data
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/ninja-internal' into MaterialsUINivesh Rajbhandari2012-07-09
|\ | | | | | | | | | | | | | | Conflicts: js/panels/Materials/materials-library-panel.reel/materials-library-panel.css js/panels/Materials/materials-popup.reel/materials-popup.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * Update copyright boilerplateKris Kowal2012-07-06
| |
* | Integrating Materials UI changes. Squashed commit of the following:Nivesh Rajbhandari2012-06-27
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 89ccb55130e67c4516e616ccc56d2a649a2b9160 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 14:20:01 2012 -0700 Position Materials Editor popup and change buttons' text color. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 89bca82adc781f4913f8d302a49a8baa907631c5 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 12:00:51 2012 -0700 Support deleting and editing custom materials. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 5be5160c4786beb70e8ad4d75562adb135718c6c Merge: 1d9d9f6 2ebf3e3 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Wed Jun 27 11:11:37 2012 -0700 Merge branch 'refs/heads/ninja-internal' into WebGLMaterials Conflicts: js/data/panels-data.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 1d9d9f6e66ea7585f07ed461cebba99e71f65de0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 22:01:22 2012 -0700 "Save as" support to duplicate material with modified settings. Also removed Add button and disabled Reset button for now. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit bf1037508dbc686f2884765344832f906cbf06d0 Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 17:23:31 2012 -0700 Added UI for duplicating and deleting materials in the Materials Library. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> commit 54930792f9c417df5f739831164aa1f96a41d67a Author: Nivesh Rajbhandari <mqg734@motorola.com> Date: Tue Jun 26 14:29:17 2012 -0700 Added preview of material in materials editor popup and fixed some styling. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-25
|\ | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-19
| |\
| * \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-08
| |\ \
| * \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-07
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-06-04
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * \ \ \ \ Merge branch 'refs/heads/ninja-internal-master' into cut-copy-pasteAnanya Sen2012-05-31
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/styles-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | copy/paste POCAnanya Sen2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | | | | Binding View :Requested Changes for Pull RequestArmen Kesablyan2012-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | Objects Panel - removed for nowEric Guzman2012-06-15
| | | | | |
* | | | | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | Merge pull request #280 from pushkarjoshi/brushtoolValerio Virgillito2012-06-08
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Brushtool
| | * | | | change units for smoothing and calligraphic angle in PIPushkar Joshi2012-06-07
| | | | | |
| | * | | | change the PI to make it look like the fill color affects the brush stroke colorPushkar Joshi2012-06-07
| | | | | |
| * | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | * | | | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
| * | | | | disabling the menu when closing all filesValerio Virgillito2012-06-05
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| | |/ / | |/| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Binding tool subtool issuesArmen Kesablyan2012-05-23
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | CSS Panel - Update components to use new serialization formatEric Guzman2012-05-22
| | | |
| * | | Remove Old CSS PanelEric Guzman2012-05-21
| | | |
| * | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
| |\ \ \ | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| | * | | fixed the shape subtool not refreshing the iconValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-17
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-05-10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
| * | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-30
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-23
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-09
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-05
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-04-02
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | CSS Panel - Add new panel to panel dataEric Guzman2012-03-13
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | | | | | | | | | code cleanup and refactoring of the document controller and stage viewValerio Virgillito2012-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | | | | | | Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito