| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch 'refs/heads/master' into minorFixes_7.1 | Eric Guzman | 2012-08-21 |
| |\ | |||
| | * | removing unnecessary references to the tag tool. | Valerio Virgillito | 2012-08-20 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/master' into minorFixes_7.1 | Eric Guzman | 2012-08-20 |
| |\| | |||
| | * | Allow rectangle and oval shapes to be created with 0 px stroke size. Line ↵v0.7.2 | Nivesh Rajbhandari | 2012-08-15 |
| | | | | | | | | | | | | | shapes' stroke size will still be restricted to a minimum of 1 px. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | Merge branch 'IKNinja_1892' of https://github.com/mqg734/ninja into v0.7.2 | Valerio Virgillito | 2012-08-09 |
| | |\ | |||
| | | * | IKNinja_1892 - [3D] Multiple objects fly off screen when translating in Z-axis. | Nivesh Rajbhandari | 2012-08-08 |
| | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2 | Valerio Virgillito | 2012-08-09 |
| | |\ \ | |||
| | | * | | Fix: Adding browser check to implement fix for deprecated array/blob APIs | Jose Antonio Marquez | 2012-08-09 |
| | | | | | | | | | | | | | | | | | This check should be removed once version 22 of Chrome is made stable. Please test before merging. | ||
| | | * | | Fix: Using array buffer views for deprecated APIs | Jose Antonio Marquez | 2012-08-08 |
| | | | | | | | | | | | | | | | | | This addresses issues with Chrome Canary warnings related to library file copying. Please test fully before merging. | ||
| | * | | | Merge pull request #426 from mqg734/LineInCanvas | Valerio Virgillito | 2012-08-07 |
| | |\ \ \ | | | | | | | | | | | Support line drawing in existing canvas. | ||
| | | * \ \ | Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvas | Nivesh Rajbhandari | 2012-08-07 |
| | | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | | Support line shape drawing inside existing canvases. | Nivesh Rajbhandari | 2012-07-25 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2 | Valerio Virgillito | 2012-08-07 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||
| | | * | | | Fix: Added support for code/design view switching for banner templates | Jose Antonio Marquez | 2012-08-06 |
| | | | | | | | | | | | | | | | | | | | | | Fixed a bug with toggling views on banner templates, I was not handling meta data correctly nor parsing the document between the switching. This is a temp fix, should be better implement when dynamic sizing is added to the templates. | ||
| | | * | | | Fix: CSS issue with resizer background | Jose Antonio Marquez Russo | 2012-08-02 |
| | | | |/ | | |/| | |||
| | * | | | fixing a few issues when switching between code view documents | Valerio Virgillito | 2012-08-01 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | fixing the panels being disabled when going from code to design view in ↵ | Valerio Virgillito | 2012-08-01 |
| | |/ / | | | | | | | | | | | | | | | | multiple documents Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | CSS Panel - Add some padding to editable values | Eric Guzman | 2012-08-15 |
| | | | | |||
| * | | | CSS Panel - Fix layout when editing long CSS values. | Eric Guzman | 2012-08-15 |
| |/ / | |||
| * | | Fix: Replacing deprecated blobBuilder | Jose Antonio Marquez Russo | 2012-07-31 |
| | | | | | | | | | Fixes issues with copying library files from File System. Need to fix ArrayBuffer, but this is just a warning that does not break functionality. | ||
| * | | Fix: Making correct check, was checking wrong object | Jose Antonio Marquez | 2012-07-31 |
| | | | | | | | | | Prevents re-rendering the same view if selected. | ||
| * | | Fix: Enabling preview from code view | Jose Antonio Marquez | 2012-07-31 |
| | | | | | | | | | Added a temp patch to enable preview from code view when viewing HTML document (with design view). This does not save external assets, so CSS and components will not be saved. | ||
| * | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-25 |
| |\ \ | |||
| | * | | fixing uppercase name. | Valerio Virgillito | 2012-07-25 |
| | |/ | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | adding null check for currentDocument to prevent error | Ananya Sen | 2012-07-25 |
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | fixing code editor double vertical scrollbar bug | Ananya Sen | 2012-07-25 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/document/views/design-code.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | added save for code view, fixed code view editor bug, reuse code editor ↵ | Ananya Sen | 2012-07-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | options component in document bar Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/document/views/design-code.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | added save for code view, fixed code view editor bug, reuse code editor ↵ | Ananya Sen | 2012-07-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | options component in document bar Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/document/views/design-code.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> | ||
| * | | design/code view switching for stage and menu | Valerio Virgillito | 2012-07-25 |
| | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | Merge branch 'refs/heads/Ninja-master' into Document | Jose Antonio Marquez Russo | 2012-07-24 |
| |\| | |||
| | * | Merge branch 'master' of https://github.com/mayhewinator/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ | |||
| | | * | Merge branch 'master' of github.com:Motorola-Mobility/ninja | John Mayhew | 2012-07-24 |
| | | |\ | |||
| | | * | | Updated manifest.json, page title, about box and splash screen to indicate ↵ | John Mayhew | 2012-07-24 |
| | | | | | | | | | | | | | | | | | that Ninja is in a preview release. | ||
| | * | | | Merge branch 'IKNinja_1980' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ \ | |||
| | | * | | | IKNinja-1980 - [Shape] changing the stroke size of the object doesn't update ↵ | Nivesh Rajbhandari | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the bounding box selection. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| | * | | | | Merge branch 'IKNinja_1974' of https://github.com/mqg734/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||
| | | * | | | IKNinja-1974 - Bounding box gets separated from elements when zooming in/out ↵ | Nivesh Rajbhandari | 2012-07-24 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on banner and animation templates. IN draw-util's element change handler, we need to check for elementModel.pi instead of elementModel.selection now that ninja-content reports its selection as "div" instead of "body". Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com> | ||
| * | | | | adding a viewIdentifier to the model to enable design/code switch | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo: - Cleanup and remove listeners - Finish stage reload - Add remaining bindings. Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| * | | | | Update: Copying libraries to disk on switching views | Jose Antonio Marquez | 2012-07-24 |
| | | | | | | | | | | | | | | | | | This is a temporary fix to allow the code view to show the actually libraries copied to disk, otherwise there is no current feedback to users to know where these files exists (or would) on disk until the operation is made. This allows the user to edit a file consuming libraries in memory to edit in code view and changes reflect such changes without losing track of libraries. | ||
| * | | | | New: Adding logic to insert code view save method(s) | Jose Antonio Marquez | 2012-07-24 |
| | | | | | |||
| * | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\| | | | |||
| | * | | | removing console log | Valerio Virgillito | 2012-07-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com> | ||
| | * | | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ \ | | |/ / | |/| | | |||
| | | * | | Text Tool Color Change Fix | Armen Kesablyan | 2012-07-24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com> | ||
| * | | | | New: Adding method to switch from code to design view | Jose Antonio Marquez | 2012-07-24 |
| | | | | | | | | | | | | | | | | | Added functionality to parse the code view string back into a Ninja template object to redraw design view. Only outstanding bugs are timeline errors and code view layout issues. | ||
| * | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\| | | | |||
| | * | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninja | Valerio Virgillito | 2012-07-24 |
| | |\ \ \ | |||
| | | * | | | Remove console logs | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| | | * | | | FIX IK-1485 | Jonathan Duran | 2012-07-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3D bug IK 1485 Signed-off-by: Jonathan Duran <jduran@motorola.com> | ||
| * | | | | | Merge branch 'refs/heads/Ninja-Master' into Document | Jose Antonio Marquez | 2012-07-24 |
| |\| | | | | |||