aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-02-27
|\
| * Fixing app mode check.Valerio Virgillito2012-02-23
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge branch 'refs/heads/ninja-internal' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\
| * \ Merge branch 'refs/heads/ToolFixes' into WebGLMaterialsNivesh Rajbhandari2012-02-22
| |\ \
| | * \ 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>
| * | | | 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>
| * | | | 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
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-20
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \
| * \ \ \ \ Merge branch 'refs/heads/ninja-internal' into ToolFixesNivesh Rajbhandari2012-02-14
| |\ \ \ \ \
| * | | | | | Working around inconsistent color object when getting/setting WebGL values.Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | | | Updated ink bottle tool to use new setColor routine in the mediator and ↵Nivesh Rajbhandari2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | | | Merge branch 'refs/heads/master' into CSSPanelUpdatesEric Guzman2012-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.
| * | | | | 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>
| | * | | | | Removing the log of the url requestsValerio 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 '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>
| * | | | | 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>
| * | | | | | changed the document dirtying logic to be done in the feature that edits the ↵Ananya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | -added keyboard control for saving documentsAnanya Sen2012-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -mark html design view when element is added or deleted Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | fixes to document tabbingAnanya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "Revert "Reverting text/html document classes and setting up MVC ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder structure"" This reverts commit 9048cd50bf5e0a418d1d95498bb593961f72db36. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "Revert "Cleaning up""Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a90e3be8850b64e8e370aa8ff8cadaa448dd0c82. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "Revert "Merging TextDocument into BaseDocument""Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b8782f2e3dd106accbb0160a98e6b498f26752ea. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | Revert "merging from github.com/joseeight/ninja-internal/tree/FileIO is ↵Ananya Sen2012-02-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breaking opening html files… to trying to fix local build" This reverts commit 3cf1d19c5cdc9534d9c87cbc7d1fcf48e68daa42. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | | merging from github.com/joseeight/ninja-internal/tree/FileIO is breaking ↵Ananya Sen2012-02-15
| | | | | | | |