aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #63 from dhg637/new-tool-iconsValerio Virgillito2012-02-22
|\ | | | | New tool icons
| * Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Removed Sass CacheArmen Kesablyan2012-02-22
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\ | |/ |/|
* | Merge pull request #62 from mayhewinator/WorkingBranchValerio Virgillito2012-02-22
|\ \ | | | | | | Fix for bug that keeps Ninja from launching over HTTP....
| * | 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>
| * | 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
| |\ \
| * \ \ Merge branch 'nested-selection' of github.com:mencio/ninja-internal into ↵Valerio Virgillito2012-02-20
| |\ \ \ | | | | | | | | | | | | | | | nested-selection
| | * | | formatting cleanupValerio Virgillito2012-02-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | 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>
* | | | Merge pull request #13 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-21
|\ \ \ \ | | | | | | | | | | FileIO branch pull request
| * | | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge pull request #57 from joseeight/CloudFixValerio Virgillito2012-02-20
| | |\ \ \ \ | | | | | | | | | | | | | | Cloud URL localStorage Fix
| | | * | | | 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
| | | | |
* | | | | Merge pull request #10 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-18
|\ \ \ \ \ | |/ / / / |/| | | | FileIO branch pull request
| | * | | 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 pull request #55 from mencio/nested-selectionValerio Virgillito2012-02-17
|\ \ \ \ | | |/ / | |/| | Re-adding stage mouse wheel scrolling
| * | | Re-adding stage mouse wheel scrollingValerio Virgillito2012-02-17
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge pull request #54 from joseeight/TabPreviewValerio Virgillito2012-02-17
|\ \ \ \ | | | | | | | | | | Tab preview
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into TabPreviewJose Antonio Marquez2012-02-17
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #53 from joseeight/FileIOValerio Virgillito2012-02-17
|\ \ \ \ \ | | | | | | | | | | | | File IO local files webRequest redirect
| | * | | | Chrome PreviewJose Antonio Marquez2012-02-17
| |/ / / /
| * | | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'refs/heads/stage-matrix-issue'Valerio Virgillito2012-02-17
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge pull request #52 from mencio/stage-matrix-fixValerio Virgillito2012-02-16
| |\ \ \ \ | | | | | | | | | | | | Fixing the getStageWorldToGlobalMatrix bug
| | * | | | Fixing the getStageWorldToGlobalMatrix bugValerio Virgillito2012-02-16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | removing the snapManager reference in viewUtils Signed-off-by: Valerio Virgillito <valerio@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>
| | * | | Adding webRequest redirects for iFrame templatesJose Antonio Marquez2012-02-17
| | | | |
| | * | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-17
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | fixed typoValerio Virgillito2012-02-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | initial commit of the Ninja readme fileValerio Virgillito2012-02-17
|/ / / / | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 23:20:13 +0000