aboutsummaryrefslogtreecommitdiff
path: root/js
Commit message (Collapse)AuthorAge
* Adding back the local storage check in the cloudpopup.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Buttons in the rectangle properties in the tools options need to float left.Nivesh Rajbhandari2012-02-22
| | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\
| * Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\
| | * Fix for bug that keeps Ninja from launching over HTTP. We need to wrap any ↵John Mayhew2012-02-22
| | | | | | | | | | | | extension specific code in an if (window.chrome.app.isInstalled) check.
| * | Tool Button FixesArmen Kesablyan2012-02-16
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | New Icons: Last set had imperfectionsArmen Kesablyan2012-02-15
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | Tool Icons : New layoutArmen Kesablyan2012-02-15
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\ \ \
| * | | Removing unused method that was using snapManager.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Integrating Zoom tool fixes.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-22
| |\ \ \ | | | |/ | | |/|
| * | | Fixing eyedropper tool to get color from image data. This required us to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | workaround having inconsistent color object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Some more tweaks to not being able to select elements in top/side view.Nivesh Rajbhandari2012-02-20
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | PulseMaterial and RadialBlurMaterial had typos in their import code.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Integrating canvas-2d and WebGL drawing fixes. Also adding back WebGL materials.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Do not use color object for stage's border since we don't allow users to ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | modify the stage's border; we only need the border-width. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Revert "Integrating canvas-2d drawing and WebGL fixes, including adding back ↵Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | | | | | | | | | WebGL materials." This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
* | | | Color chips expect a color object, not a css value.Nivesh Rajbhandari2012-02-22
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
|\ \ \ \ | | |/ / | |/| |
| * | | user document main reel listener moved to the html-document class.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into file-io Conflicts: js/controllers/document-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | enabling nested selectionValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | formatting and removing un-used code from the stageValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Removing the log of the url requestsValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Removing the timeline selection code.Valerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Timeline selection code is now handled by the selection controller and current container change Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | Merge branch 'refs/heads/master' into nested-selectionValerio Virgillito2012-02-20
| | |\ \ \
| | * | | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | | | cleanup of the breadcrumbValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | fixing the dirty flag and removing sass changesValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Revert "check cloud availability before open file picker and new file dialogs"Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3251315ecc22544dab50623ee5862e00dfe02302. Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| | * \ \ \ \ Merge pull request #11 from ericguzman/StylesControllerUpdatesJose Antonio Marquez Russo2012-02-20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Styles controller updates
| | | * \ \ \ \ Merge branch 'refs/heads/master' into StylesControllerUpdatesEric Guzman2012-02-20
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Cloud URL localStorage FixJose Antonio Marquez2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed logic to remember and display the previously used URL for local cloud if not started on Ninja load.
| | | * | | | | Merge branch 'StylesControllerUpdates' of ↵Eric Guzman2012-02-20
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:ericguzman/ninja-internal into StylesControllerUpdates
| | | | * | | | | Styles controller - Check for element's window object before querying for ↵Eric Guzman2012-02-20
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | matching css rules.
| | | * / / / / Styles Controller -Fix invalid variable reference when looking for element's ↵Eric Guzman2012-02-20
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | window object
| | * | | | | Clean up and repairing manifestJose Antonio Marquez2012-02-19
| | | | | | |
| * | | | | | check cloud availability before open file picker and new file dialogsAnanya Sen2012-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | - moved tools specific keyboard controls for desing view onlyAnanya Sen2012-02-20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - stopped snapping when all documents are closed Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | doc.markEdited() removed from element-mediator, for style changes, as per ↵Ananya Sen2012-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | teams suggestion Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | renamed methods to use better wordsAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | use method to update dirtyFlagAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | mark document on setting color, properties and stroke.Ananya Sen2012-02-17
| | |