Skip to content

Commit 2ba33f5

Browse files
committed
Merge remote-tracking branch 'origin/master' into sso-exclusive-all
2 parents 5b4540a + 8959129 commit 2ba33f5

File tree

314 files changed

+12139
-8879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+12139
-8879
lines changed

README.md

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,25 @@ CoCalc is web-based software that enables collaboration in research, teaching, a
66

77
**CoCalc** supports sophisticated calculations that arise in teaching, research, and authoring documents. This includes working with the full data science and scientific Python stack, [SageMath](https://www.sagemath.org), [Julia](https://julialang.org), [R Statistics](https://cocalc.com/doc/r-statistical-software.html), [Octave](https://www.gnu.org/software/octave/), and much more. It also offers capabilities to author documents in [LaTeX](https://cocalc.com/doc/latex-editor.html), R/knitr and Markdown, storing and organizing files, a web-based [Linux Terminal](https://doc.cocalc.com/terminal.html), an [X11 graphical desktop](https://doc.cocalc.com/x11.html), and communication tools like a [chatrooms](https://doc.cocalc.com/chat.html), [course management](https://cocalc.com/doc/teaching.html) and more. It is the best choice for [teaching remote scientific courses](https://cocalc.com/doc/teaching.html).
88

9+
## Quick Start
10+
11+
1. Visit https://cocalc.com
12+
2. Sign up for a free account
13+
3. Create a new project
14+
4. Choose a computational environment (e.g., Jupyter Notebook, Sage Worksheet, LaTeX Editor)
15+
5. Start collaborating with others in real-time
16+
17+
## Key Features
18+
19+
- **Jupyter Notebooks**: Interactive Python, R, and Julia environments
20+
- **Sage Worksheets**: Powerful mathematical computations
21+
- **LaTeX Editor**: Collaborative document creation with real-time preview
22+
- **Linux Terminal**: Full command-line access
23+
- **Computational Whiteboard**: Visual collaboration and code execution
24+
- **Course Management**: Tools for teaching and managing classes
25+
- **Real-time Collaboration**: Work together seamlessly on projects
26+
- **Version Control**: Built-in time travel and project history
27+
928
## Website
1029

1130
- [CoCalc](https://cocalc.com/index.html) -- commercial CoCalc hosting and support
@@ -20,6 +39,24 @@ CoCalc is web-based software that enables collaboration in research, teaching, a
2039
You can obtain a packaged version of CoCalc for your own on-premises infrastructure: [**CoCalc Cloud**](https://doc-cloud.cocalc.com/).
2140
It runs on Kubernetes and inherits the security and scalability of the SaaS platform.
2241

42+
### CoCalc Cloud
43+
44+
CoCalc Cloud runs on Kubernetes and inherits the security and scalability of the SaaS platform. To get started:
45+
46+
1. Visit https://cocalc.com/pricing/onprem for pricing information
47+
2. Contact [email protected] to discuss deployment options
48+
3. Prepare your Kubernetes cluster
49+
4. Follow the deployment guide at https://doc-cloud.cocalc.com/
50+
5. Configure your instance and start using your self-hosted CoCalc
51+
52+
### CoCalc-Docker (for smaller deployments or personal use)
53+
54+
1. Ensure Docker is installed on your system
55+
2. Visit the CoCalc-Docker repository: https://github.com/sagemathinc/cocalc-docker
56+
3. Follow the installation and usage instructions provided in the repository's README
57+
58+
For more detailed information on self-hosting options, please contact [email protected].
59+
2360
## History
2461

2562
_CoCalc_ was formerly called _SageMathCloud_.
@@ -28,6 +65,8 @@ The name was coined in fall 2016 and changed around spring 2017.
2865

2966
## Contributors
3067

68+
CoCalc is made possible by the hard work of many contributors. Our team includes mathematicians, computer scientists, and software engineers from around the world. Key contributors include:
69+
3170
- Greg Bard
3271
- Rob Beezer
3372
- Blaec Bejarano
@@ -48,6 +87,8 @@ The name was coined in fall 2016 and changed around spring 2017.
4887

4988
... and others: See https://github.com/sagemathinc/cocalc/graphs/contributors
5089

90+
We welcome new contributions! If you're interested in contributing, please see our Contributing Guidelines (link to be added).
91+
5192
## Copyright/License
5293

5394
The copyright of CoCalc is owned by SageMath, Inc., and the source code
@@ -76,6 +117,14 @@ In particular, [CoCalc OnPrem](https://cocalc.com/pricing/onprem) is designed fo
76117

77118
The scripts [here](https://github.com/sagemathinc/cocalc/tree/master/src/dev) might be helpful.  We do most of our development of CoCalc on https://cocalc.com itself. CoCalc requires pnpm version at least 9.
78119

120+
## Support and Community
121+
122+
- **User Manual**: https://doc.cocalc.com/
123+
- **Mailing List**: https://groups.google.com/forum/#!forum/cocalc
124+
- **Discord Chat**: https://discord.gg/nEHs2GK
125+
- **Bug Reports**: https://github.com/sagemathinc/cocalc/issues
126+
- **Commercial Support**: https://cocalc.com/pricing
127+
79128
## Acknowledgements
80129

81130
### Browserstack
@@ -86,4 +135,3 @@ We are grateful to BrowserStack for providing infrastructure to test CoCalc.
86135
### Google
87136

88137
We thank Google for donating over \$150K in cloud credits since 2014 to support this project.
89-

src/compute/compute/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"awaiting": "^3.0.0",
4242
"cookie": "^0.5.0",
4343
"debug": "^4.3.2",
44-
"websocketfs": "^0.17.3",
44+
"websocketfs": "^0.17.4",
4545
"ws": "^8.18.0"
4646
},
4747
"homepage": "https://github.com/sagemathinc/cocalc/tree/master/src/packages/compute",

0 commit comments

Comments
 (0)