aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #16 from ananyasen/FileIOJose Antonio Marquez Russo2012-02-22
|\ | | | | FileIO branch pull request
| * Merge branch 'refs/heads/FileIO-jose' into FileIOAnanya Sen2012-02-22
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | fix bug when closing the first document tabAnanya Sen2012-02-21
| | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | edit by Eric G.: catch the error instead of doing the null check for the ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | stale element Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | added null check for matchedRules in styles-controller.js, to fix js error ↵Ananya Sen2012-02-21
| | | | | | | | | | | | | | | | | | on reopening and edited html document Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | - file picker - select file on double clickAnanya Sen2012-02-21
| | | | | | | | | | | | | | | | | | - check cloud availability before IO operations [open file, new file, Save, Save As]. Canceling operation if cloud was unavailable, as per team's agreement. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Removed css not needed in Ninja TemplateJose Antonio Marquez2012-02-22
| | |
* | | Merge pull request #15 from mencio/file-ioJose Antonio Marquez Russo2012-02-22
|\ \ \ | |_|/ |/| | moving the default folder location to the navigator to fix the ok button issue
| * | moving the default folder location to the navigator to fix the ok button issueValerio Virgillito2012-02-22
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Improving temp CSS loading fixJose Antonio Marquez2012-02-22
| | | | | | | | | | | | Adding logic to parse the entire DOM and insert the style tag loading the link element content directly above.
* | | Merge pull request #14 from mencio/file-ioJose Antonio Marquez Russo2012-02-21
|\| | | | | | | | File io - Code cleanup and added default folder to the file new dialog.
| * | Adding some comments.Valerio Virgillito2012-02-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Adding the default folder by default when opening a new file dialog.Valerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | Adding the default folder name in the new file dialog input field. Also some more cleanup. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | cleanup - using montage functions handlers and using the NJeventValerio Virgillito2012-02-21
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | cleanup - Removing temporary div to render the popupsValerio Virgillito2012-02-21
| | | | | | | | | | | | | | | | | | We don't need to render the popup before opening them. Removing that hack. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Temp CSS fix (for file open)Jose Antonio Marquez2012-02-21
|/ / | | | | | | Implemented temporary work-around to the css-cross-origin issue on files loaded into Ninja. Fix is for open file, need to implement save functionality and integrate with CSS panel.
* | 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
| |/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 06:54:36 +0000