aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #423 from joseeight/Chrome21FixesValerio Virgillito2012-07-31
|\ | | | | Fix: Replacing deprecated blobBuilder
| * Fix: Replacing deprecated blobBuilderJose Antonio Marquez Russo2012-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.
* Merge pull request #422 from joseeight/DocumentValerio Virgillito2012-07-31
|\ | | | | Document Code View
| * Fix: Making correct check, was checking wrong objectJose Antonio Marquez2012-07-31
| | | | | | | | Prevents re-rendering the same view if selected.
| * Fix: Enabling preview from code viewJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-07-25
| |\ | |/ |/|
* | fixing uppercase name.Valerio Virgillito2012-07-25
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #47 from ananyasen/DocumentJose Antonio Marquez Russo2012-07-25
| |\ | | | | | | Code view fixes.
| | * adding null check for currentDocument to prevent errorAnanya Sen2012-07-25
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * fixing code editor double vertical scrollbar bugAnanya Sen2012-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 Sen2012-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 Sen2012-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>
| * Merge pull request #46 from mencio/document-switchJose Antonio Marquez Russo2012-07-25
| |\ | | | | | | design/code view switching for stage and menu
| | * design/code view switching for stage and menuValerio Virgillito2012-07-25
| |/ | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-24
| |\ | |/ |/|
* | Merge branch 'master' of https://github.com/mayhewinator/ninjaValerio Virgillito2012-07-24
|\ \
| * \ Merge branch 'master' of github.com:Motorola-Mobility/ninjaJohn Mayhew2012-07-24
| |\ \
| * | | Updated manifest.json, page title, about box and splash screen to indicate ↵John Mayhew2012-07-24
| | | | | | | | | | | | | | | | that Ninja is in a preview release.
* | | | Merge branch 'UserDetection' of https://github.com/joseeight/ninjaValerio Virgillito2012-07-24
|\ \ \ \
| * | | | New: OS check on loadJose Antonio Marquez2012-07-24
| | |/ / | |/| | | | | | | | | | Performing OS check on load to redirect users to system requirements if their OS currently is not supported.
* | | | Merge branch 'IKNinja_1980' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-24
|\ \ \ \
| * | | | IKNinja-1980 - [Shape] changing the stroke size of the object doesn't update ↵Nivesh Rajbhandari2012-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the bounding box selection. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Merge branch 'IKNinja_1974' of https://github.com/mqg734/ninjaValerio Virgillito2012-07-24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | IKNinja-1974 - Bounding box gets separated from elements when zooming in/out ↵Nivesh Rajbhandari2012-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>
| | | * Merge pull request #45 from mencio/document-switchJose Antonio Marquez Russo2012-07-24
| | | |\ | | | | | | | | | | Document switch fixes
| | | | * Merge branch 'document-switch' of github.com:mencio/ninja into document-switchValerio Virgillito2012-07-24
| | | | |\
| | | | | * adding a viewIdentifier to the model to enable design/code switchValerio Virgillito2012-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo: - Cleanup and remove listeners - Finish stage reload - Add remaining bindings. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * | adding a viewIdentifier to the model to enable design/code switchValerio Virgillito2012-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 viewsJose Antonio Marquez2012-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 Marquez2012-07-24
| | | | |
| | | * | Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
| | | |\ \ | |_|_|/ / |/| | | / | | | |/
* | | | removing console logValerio Virgillito2012-07-24
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'TextTool-Color' of https://github.com/dhg637/ninjaValerio Virgillito2012-07-24
|\ \ \ \ | |/ / / |/| | |
| * | | Text Tool Color Change FixArmen Kesablyan2012-07-24
| | | | | | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| | | * New: Adding method to switch from code to design viewJose Antonio Marquez2012-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 DocumentJose Antonio Marquez2012-07-24
| | | |\ | |_|_|/ |/| | |
* | | | Merge branch 'TimelineUber' of https://github.com/imix23ways/ninjaValerio Virgillito2012-07-24
|\ \ \ \
| * | | | Remove console logsJonathan Duran2012-07-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Duran <jduran@motorola.com>
| * | | | FIX IK-1485Jonathan Duran2012-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 3D bug IK 1485 Signed-off-by: Jonathan Duran <jduran@motorola.com>
| | | | * Merge branch 'refs/heads/Ninja-Master' into DocumentJose Antonio Marquez2012-07-24
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | jshint cleanup on the tools directoryValerio Virgillito2012-07-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | | | * New: Adding method to display document in code viewJose Antonio Marquez Russo2012-07-23
| | | | | | | | | | | | | | | | | | | | Added method to parse in memory document in code view. This allows users to view current in memory document in code view while not saving the document or external files. Still need to handle naming of paths for files that require saving but are not saved (webGL and Montage libraries). Also, need to implement method to switch back from code view to design view, but will need Timeline fixes.
| | | | * In Progress: Cleaning up mergeJose Antonio Marquez Russo2012-07-23
| | | | | | | | | | | | | | | | | | | | Cleaned up new updates. Still pending is adding functionality to parse the document when toggling views and fix Timeline errors. Code view also has some rending issues that will be fixed, this is just a clean up.
| | | | * Merge pull request #44 from ananyasen/DocumentJose Antonio Marquez Russo2012-07-23
| | | | |\ | | | | | | | | | | | | first cut to show code editor for design document
| | | | | * Merge branch 'refs/heads/Jose-Document' into DocumentAnanya Sen2012-07-23
| | | | | |\
| | | | | * | show design code editor - first cutAnanya Sen2012-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | | * | parameterize the parentContainer for text documentAnanya Sen2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | | | * | | Merge branch 'refs/heads/Ninja-master' into DocumentJose Antonio Marquez Russo2012-07-23
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'tag-properties-fixes' of https://github.com/mencio/ninjaValerio Virgillito2012-07-23
|\ \ \ \ \ \ \
| * | | | | | | tag-tool: Minor styles update and some cleanupValerio Virgillito2012-07-23
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Styled the position drop down and moved some styles to the reel. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:22:12 +0000