| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into dom-architecture | Valerio Virgillito | 2012-05-08 |
| |\ | |||
| | * | fixed javascript errors | Ananya Sen | 2012-05-07 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Adding Chrome Preview | Jose Antonio Marquez | 2012-05-08 |
| | | | |||
| * | | 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 currentContainer | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | 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> | ||
| | | * | | | 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/dom-architecture-master' into Dom-Architecture | Nivesh Rajbhandari | 2012-05-04 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-web/default_html.css Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-03 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | | Merge branch 'refs/heads/Ninja-Internal' into Document | Jose Antonio Marquez | 2012-05-01 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | | Preliminary IO to new DOM view | Jose Antonio Marquez | 2012-05-01 |
| | | | | | | |||
| * | | | | | Removed special-casing for new template workflow. Instead, we will enforce ↵ | Nivesh Rajbhandari | 2012-05-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a width and height on the body in order to do 3d. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | | Fixing selection and layout code to exclude SCRIPT and STYLE tags. | Nivesh Rajbhandari | 2012-05-04 |
| | |_|_|/ |/| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-03 |
| |\ \ \ \ | | |_|/ | |/| | | |||
| | * | | | minor formatting | Valerio Virgillito | 2012-05-03 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Dom Manipulation | Kruti Shah | 2012-05-03 |
| | | |/ | |/| | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-05-01 |
| |\| | | |||
| | * | | Get working plane grid to draw for new stage web template workflow. | Nivesh Rajbhandari | 2012-05-01 |
| | |/ | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Squashed commit of stage architecture | Valerio Virgillito | 2012-04-30 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | Merge branch 'refs/heads/master' into stage-document-architecture | Valerio Virgillito | 2012-04-26 |
| | |\ | |||
| | * | | Added a body controller | Valerio Virgillito | 2012-04-24 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | added shortkeys for commenting and uncomment | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | IKNINJA-1537 - don't show code hinting for ctrl+S | Ananya Sen | 2012-04-30 |
| | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | added key shortcuts' list dropdown in view option bar | Ananya Sen | 2012-04-27 |
| | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-26 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| | * | | Fixed issue with setting stroke when using the PI. | Nivesh Rajbhandari | 2012-04-24 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'refs/heads/ninja-internal' into AllFixes | Nivesh Rajbhandari | 2012-04-24 |
| | |\| | |||
| | | * | Temporary fix for the PI and Stage when opening the new template. | Valerio Virgillito | 2012-04-23 |
| | | | | | | | | | | | | | 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> | ||
| | | * | typo fix | Valerio Virgillito | 2012-04-19 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | | * | initial stage web template | Valerio Virgillito | 2012-04-18 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | Allow users to toggle application of stroke and border settings when using ↵ | Nivesh Rajbhandari | 2012-04-24 |
| | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵ | Nivesh Rajbhandari | 2012-04-20 |
| | |/ | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | removing debugger | Ananya Sen | 2012-04-26 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | IKNINJA-1551 - added editor support for other file types | Ananya Sen | 2012-04-26 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | - use on ctrl+space for code hinting | Ananya Sen | 2012-04-25 |
| | | | | | | | | | | | | | - use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | IKNINJA-1529 : zooming such that cursor position can be calculated accurately | Ananya Sen | 2012-04-24 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | IKNINJA-1530 : turned off autocompletion and just kept the code hinting | Ananya Sen | 2012-04-24 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | IKNINJA-1529 : zooming to fix font overlap issue | Ananya Sen | 2012-04-23 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | set editor background color as per the selected theme | Ananya Sen | 2012-04-20 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | - disable autocompletion option for unsupported file type | Ananya Sen | 2012-04-19 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | - fixed the text cursor | Ananya Sen | 2012-04-19 |
| | | | | | | | | | | | | | - code cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | - collapse panels for code view, restore for design view | Ananya Sen | 2012-04-18 |
| | | | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements | Ananya Sen | 2012-04-17 |
| |\| | |||
| | * | Adding back setProperties for canvas because width and height values need to ↵ | Nivesh Rajbhandari | 2012-04-17 |
| | | | | | | | | | | | | | be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'refs/heads/ninja-internal' into WebGLFixes | Nivesh Rajbhandari | 2012-04-17 |
| | |\ | |||
| | | * | Fixing the shape border | Valerio Virgillito | 2012-04-13 |
| | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||