aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #434 from ericguzman/minorFixes_7.1Valerio Virgillito2012-08-21
|\ | | | | Minor fixes
| * Merge branch 'refs/heads/master' into minorFixes_7.1Eric Guzman2012-08-21
| |\ | |/ |/|
* | Merge pull request #432 from mencio/cleanupValerio Virgillito2012-08-20
|\ \ | | | | | | removing unnecessary references to the tag tool.
| * | removing unnecessary references to the tag tool.Valerio Virgillito2012-08-20
|/ / | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Tools - Removed transition on tool button hover to prevent flickerEric Guzman2012-08-21
| |
| * Merge branch 'refs/heads/master' into minorFixes_7.1Eric Guzman2012-08-20
| |\ | |/ |/|
* | Revert "updating the manifest to v0.7.2"Valerio Virgillito2012-08-15
| | | | | | | | | | | | This reverts commit 7e73b7def962f00f32b0d6acf04b0bc7005ea456. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/v0.7.2'Valerio Virgillito2012-08-15
|\ \
| * | Allow rectangle and oval shapes to be created with 0 px stroke size. Line ↵v0.7.2Nivesh Rajbhandari2012-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.2Valerio Virgillito2012-08-09
| |\ \
| | * | IKNinja_1892 - [3D] Multiple objects fly off screen when translating in Z-axis.Nivesh Rajbhandari2012-08-08
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2Valerio Virgillito2012-08-09
| |\ \ \
| | * | | Fix: Adding browser check to implement fix for deprecated array/blob APIsJose Antonio Marquez2012-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 APIsJose Antonio Marquez2012-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/LineInCanvasValerio Virgillito2012-08-07
| |\ \ \ \ | | | | | | | | | | | | Support line drawing in existing canvas.
| | * \ \ \ Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvasNivesh Rajbhandari2012-08-07
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Support line shape drawing inside existing canvases.Nivesh Rajbhandari2012-07-25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | Merge branch 'Document' of https://github.com/joseeight/ninja into v0.7.2Valerio Virgillito2012-08-07
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix: Added support for code/design view switching for banner templatesJose Antonio Marquez2012-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 backgroundJose Antonio Marquez Russo2012-08-02
| | | |/ / | | |/| |
| * | | | fixing a few issues when switching between code view documentsValerio Virgillito2012-08-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | updating the manifest to v0.7.2Valerio Virgillito2012-08-01
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | fixing the panels being disabled when going from code to design view in ↵Valerio Virgillito2012-08-01
| |/ / / | | | | | | | | | | | | | | | | | | | | multiple documents Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* / / / adding test cases for JasmineValerio Virgillito2012-08-12
|/ / / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * CSS Panel - Add some padding to editable valuesEric Guzman2012-08-15
| | |
| | * CSS Panel - Fix layout when editing long CSS values.Eric Guzman2012-08-15
| |/ |/|
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 04:15:07 +0000