Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixing reference of document | Jose Antonio Marquez | 2012-05-24 |
| | |||
* | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-05-10 |
|\ | | | | | | | | | Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html | ||
| * | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | Nesting absolute element in the Tag tool. Refactoring element creation and ↵ | Valerio Virgillito | 2012-05-02 |
| | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-30 |
|\| | |||
| * | Fixing the element model and adding get element | Valerio Virgillito | 2012-04-26 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-09 |
|\| | |||
| * | Merge branch 'refs/heads/ToolFixes' into WebGLMaterials | Nivesh Rajbhandari | 2012-04-04 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/default_html.css js/mediators/element-mediator.js js/panels/properties.reel/properties.js js/tools/BrushTool.js js/tools/LineTool.js js/tools/PenTool.js js/tools/SelectionTool.js js/tools/ShapeTool.js js/tools/TranslateObject3DTool.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | IKNinja-1399 - [Eyedropper] Not sampling WebGL gradients after file open. | Nivesh Rajbhandari | 2012-04-02 |
| | | | | | | | | | | | | | | | | | | Need to set the isShape property in the elementModel on file open. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Build elements' properties3d values on file open. | Nivesh Rajbhandari | 2012-03-27 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterials | Nivesh Rajbhandari | 2012-03-27 |
| |\| | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Do not set webkit-transform styles on elements unless 3d is used on them. | Nivesh Rajbhandari | 2012-03-21 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | Get matrix and perspective distance from styles controller. | Nivesh Rajbhandari | 2012-03-21 |
| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-04-02 |
|\ \ \ | | |/ | |/| | |||
| * | | Fixing the selection issues | Valerio Virgillito | 2012-03-20 |
| |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-03-13 |
|\| | | | | | | | | | Conflicts: js/controllers/styles-controller.js | ||
| * | Create element models based on nodeName. | Nivesh Rajbhandari | 2012-03-06 |
| | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
* | | Merge branch 'refs/heads/master' into CSSPanelUpdates | Eric Guzman | 2012-02-29 |
|\| | | | | | | | | | Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | ||
| * | renaming makeElementModel2 to makeModelFromElement | Valerio Virgillito | 2012-02-23 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | CSS Panel Update | Eric Guzman | 2012-02-22 |
|/ | |||
* | 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/NinjaInternal' into FileIO | Jose Antonio Marquez | 2012-02-10 |
|\ | | | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html | ||
| * | deleted old utils file and move single method into NJUtils | Valerio Virgillito | 2012-02-09 |
| | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
* | | uri validation moved to file io apis | Ananya Sen | 2012-02-02 |
| | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | refactoring some file names and locations, | Ananya Sen | 2012-02-02 |
| | | | | | | | | | | | | change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | fixed reference to coreioapi | Ananya Sen | 2012-02-01 |
| | | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
* | | Merged old FileIO | Jose Antonio Marquez | 2012-01-27 |
|/ | |||
* | First commit of Ninja to ninja-internal | Pierre Frisch | 2012-01-27 |
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com> |