| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | New stage template should not distinguish between user and template body styles. | Nivesh Rajbhandari | 2012-05-10 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Draw 3d compass at the bottom-left. | Nivesh Rajbhandari | 2012-05-10 | |
| | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-09 | |
| |\ | ||||
| | * | Temp removing montage clean up | Jose Antonio Marquez | 2012-05-09 | |
| | | | ||||
| | * | Preliminary Montage Template Cleanup | Jose Antonio Marquez | 2012-05-09 | |
| | | | | | | | | | The template creator is currently not returning serializing code, but does clean the document. Need to investigate reason why, currently all components are removed on save. | |||
| | * | fixing the components for the new dom | Valerio Virgillito | 2012-05-09 | |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| * | | Adding support to save body's css styles on preview. | Nivesh Rajbhandari | 2012-05-09 | |
| |/ | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | Merge pull request #204 from joseeight/Document | Valerio Virgillito | 2012-05-08 | |
| |\ | | | | | I/O: Adding Save Functionality | |||
| | * | Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document | Jose Antonio Marquez | 2012-05-08 | |
| | |\ | ||||
| | * | | 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... | |||
| * | | | Merge branch 'dom-architecture' of ↵ | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ | | |/ | |/| | | | | github.com:Motorola-Mobility/ninja-internal into dom-architecture | |||
| | * | | Merge pull request #203 from mqg734/Dom-Architecture | Valerio Virgillito | 2012-05-08 | |
| | |\ \ | | | | | | | | | Get clicked element when body is scrolled. Also fixed zoom code's iframe reference. | |||
| | | * | | Get clicked element when body is scrolled. | Nivesh Rajbhandari | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ \ | |/ / / |/| | | | ||||
| | * | | | Fixed a snapping issue on the mouse down in drawing tools. | hwc487 | 2012-05-08 | |
| | | | | | ||||
| | * | | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵ | hwc487 | 2012-05-08 | |
| | |\ \ \ | | | | | | | | | | | | | | | | Snapping | |||
| | * | | | | fixes for 2D and 3D translation. | hwc487 | 2012-05-07 | |
| | | | | | | ||||
| * | | | | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | ||||
| | * | | | IKNINJA-1603 | Ananya Sen | 2012-05-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Uncaught TypeError: Cannot read property 'documentRoot' of null js/components/layout/bread-crumb.reel/bread-crumb.js:26 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | fixed javascript errors | Ananya Sen | 2012-05-07 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| | * | | | removed incorrect id selector css for code view container since its breaking it. | Ananya Sen | 2012-05-07 | |
| | |/ / | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | |||
| * | | | Merge pull request #202 from joseeight/Document | Valerio Virgillito | 2012-05-08 | |
| |\ \ \ | | |/ | |/| | Chrome Preview | |||
| | * | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 | |
| | | | | ||||
| * | | | Stage should update scroll offsets when scrolled. Note that this is not ↵ | Nivesh Rajbhandari | 2012-05-08 | |
| |/ / | | | | | | | | | | | always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | 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. | |||
| * | | Temporarily skipping activeDocument.currentView check so keyboard shortcuts ↵ | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | | | | | still work. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | Fixing references to iframe's styles in new template. | Nivesh Rajbhandari | 2012-05-04 | |
| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | |||
| * | | 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> | |||
| * | | Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 | |
| |\ \ | ||||
| | * | | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-04 | |
| | |\| | ||||
| | | * | Fixing the color popup | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | temporary commenting a timeline bug preventing nested selection | Valerio Virgillito | 2012-05-04 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | fixing the currentContainer | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | | |\ | ||||
| | | | * \ | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | | Refactor creating elements. Removed makeNJElement and separated the model ↵ | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | | * | | | Merge branch 'refs/heads/master' into tag-2.0 | Valerio Virgillito | 2012-05-03 | |
| | | | |\ \ \ | ||||
| | | | * | | | | 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> | |||
| | | | * | | | | code cleanup | Valerio Virgillito | 2012-05-02 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Removing unused components references | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Fixing the lock button css | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | finishing to replace all id with data-montage-id | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Removing more id and changing the appropriate CSS for them | Valerio Virgillito | 2012-05-03 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | |||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | ||||
| | | * | | | | | Merge branch 'refs/heads/master' into data-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ | ||||
| | | * | | | | | | use data-montage-id instead of id in template | Ananya Sen | 2012-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-id | Valerio Virgillito | 2012-05-03 | |
| | | |\ \ \ \ \ \ | ||||