| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | fixing the components for the new dom | Valerio Virgillito | 2012-05-09 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-08 | |
| |\ \ | ||||
| | * | | Get clicked element when body is scrolled. | Nivesh Rajbhandari | 2012-05-08 | |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | Adding SAVE for I/O | Jose Antonio Marquez | 2012-05-08 | |
| |/ / | | | | | | | Adding save functionality to new template. Need to implement user UI for prompts and also clean up... | |||
| * | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 | |
| | | | ||||
| * | | Moving webGL to own helper class | Jose Antonio Marquez | 2012-05-07 | |
| | | | | | | | | | Cleaning up webGL for better working files. | |||
| * | | Extracting CSS methods to parsing class. | Jose Antonio Marquez | 2012-05-07 | |
| | | | | | | | | | Need to do the same with webGL. | |||
| * | | Adding webGL support for opening files | Jose Antonio Marquez | 2012-05-07 | |
| | | | | | | | | | Added I/O for loading webGL on open file. I/O support for saving to come. | |||
| * | | Draw 3d grid by default since app model is not hooked up yet. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Fixing body's default styles. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Clean up, ready for alpha check-in | Jose Antonio Marquez | 2012-05-03 | |
| | | | ||||
| * | | Full CSS support on open | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | Add full CSS for files on open (including loading cross-domain). This is only for files that are opened. | |||
| * | | Reloading local stylesheets | Jose Antonio Marquez | 2012-05-03 | |
| | | | | | | | | | Added the reload method of local linked styles, still need to parse style contents for URLs and also add cross-domain stylesheet support. | |||
| * | | Adding hack to allow for blank documents to open | Jose Antonio Marquez | 2012-05-02 | |
| | | | ||||
| * | | Switching DOM Mutation Events to HTML5 | Jose Antonio Marquez | 2012-05-02 | |
| | | | ||||
| * | | Partial URL parsing | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | Added temporary URL parsing to document assets. (head and body) | |||
| * | | Preliminary Open File (new template) | Jose Antonio Marquez | 2012-05-02 | |
| | | | | | | | | | Added basic open file functionality, does not parse document for URLs. | |||
| * | | More clean up, updating menu items | Jose Antonio Marquez | 2012-05-01 | |
| | | | ||||
| * | | Cleaning up template | Jose Antonio Marquez | 2012-05-01 | |
| | | | ||||
| * | | Preliminary IO to new DOM view | Jose Antonio Marquez | 2012-05-01 | |
| | | | ||||
| * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-01 | |
| |\| | ||||
| | * | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | Merge pull request #182 from ericmueller/Canvas-interaction | Valerio Virgillito | 2012-04-30 | |
| | |\ | | | | | | | Canvas interaction | |||
| | | * | canvas interaction | hwc487 | 2012-04-26 | |
| | | | | ||||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-25 | |
| | | |\ | | | | | | | | | | | | | Canvas-interaction | |||
| | | * \ | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-04-24 | |
| | | |\ \ | | | | | | | | | | | | | | | | Canvas-interaction | |||
| | | * | | | canvas interaction | hwc487 | 2012-04-23 | |
| | | | | | | ||||
| * | | | | | Setting up new architecture for I/O | Jose Antonio Marquez | 2012-05-01 | |
| |/ / / / | ||||
| * | | | | Merge branch 'stage-document-architecture' of ↵ | Valerio Virgillito | 2012-04-26 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | https://github.com/mencio/ninja-internal into serialization | |||
| | * | | | | Fixed the stage border and layout in the new template | Valerio Virgillito | 2012-04-26 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | Simplifying the getElement method from stage and adding an exclusion list to ↵ | Valerio Virgillito | 2012-04-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the new template Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | | | 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 stage-document-architecture | Valerio Virgillito | 2012-04-24 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | | Added a body controller | Valerio Virgillito | 2012-04-24 | |
| | | |_|/ | |/| | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | Removing all "module" declarations and replaced with "prototype" in ↵ | John Mayhew | 2012-04-26 | |
| | |/ / |/| | | | | | | | | preparation for montage converting to the new "prototype" format fully | |||
| * | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-24 | |
| |\| | | ||||
| | * | | adjusting the bread crumb to work with the new template | Valerio Virgillito | 2012-04-23 | |
| | | | | | | | | | | | | | | | | | | | Initial container get setup in ninja now. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | reverting old template to current working status. New template work. | Valerio Virgillito | 2012-04-20 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | * | | Merge branch 'refs/heads/Document' into stage-document-architecture | Valerio Virgillito | 2012-04-19 | |
| | |\ \ | ||||
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-10 | |
| | | |\| | ||||
| | | * | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-04 | |
| | | |\ \ | ||||
| | | * | | | Backup for merge | Jose Antonio Marquez | 2012-04-04 | |
| | | | | | | ||||
| | | * | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-04-02 | |
| | | |\ \ \ | ||||
| | | * | | | | Setting up document rework | Jose Antonio Marquez | 2012-04-02 | |
| | | | | | | | ||||
| | * | | | | | initial stage web template | Valerio Virgillito | 2012-04-18 | |
| | | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | | | | Merge branch 'master' into pentool | Pushkar Joshi | 2012-04-17 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js | |||
| | * | | | | Merge pull request #159 from mqg734/WebGLMaterials | Valerio Virgillito | 2012-04-09 | |
| | |\ \ \ \ | | | | | | | | | | | | | 3D tools, eyedropper, fill, ink-bucket, gradients and shape fixes. | |||
| | | * | | | | Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel ↵ | Nivesh Rajbhandari | 2012-04-05 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| | | * | | | | 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> | |||
| | | | * \ \ \ | Merge branch 'refs/heads/WebGLFileIO' into ToolFixes | Nivesh Rajbhandari | 2012-04-04 | |
| | | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: assets/canvas-runtime.js js/controllers/elements/shapes-controller.js js/lib/drawing/world.js js/lib/geom/geom-obj.js js/lib/geom/line.js js/mediators/element-mediator.js js/panels/presets/animations-presets.reel/animations-presets.js js/panels/presets/style-presets.reel/style-presets.js js/panels/presets/transitions-presets.reel/transitions-presets.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||