Skip to content

Commit

Permalink
Merge branch 'main' into add-context-menu-HeyPuter#876
Browse files Browse the repository at this point in the history
  • Loading branch information
mariatouil authored Dec 18, 2024
2 parents a9b13e1 + d67a6f0 commit c7fb334
Show file tree
Hide file tree
Showing 397 changed files with 17,952 additions and 8,588 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@ dist/
# this is for jetbrain IDEs
.idea/
/puter

# Local Netlify folder
.netlify
src/emulator/release/
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,18 @@ If you'd like to contribute code to Puter, you need to fork the project and subm

We'll review your pull request and work with you to get your changes merged into the project.

## Repository Structure

![file structure](./doc/File%20Structure.drawio.png)

## Your first code contribution

We maintain a list of issues that are good for first-time contributors. You can find these issues by searching for the [`good first issue`](https://github.com/HeyPuter/puter/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) label in our [GitHub repository](https://github.com/HeyPuter/puter). These issues are designed to be relatively easy to fix, and we're happy to help you get started. Pick an issue that interests you, and leave a comment on the issue to let us know you're working on it.

<br>

## Documentation for Contributors

See [doc/contributors/index.md](./doc/contributors/index.md) for more information.
### Backend
See [src/backend/CONTRIBUTING.md](src/backend/CONTRIBUTING.md)

<br>

Expand Down
1 change: 1 addition & 0 deletions awesome/#DoesItRunPuter.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
- [Steam Deck](https://twitter.com/everythingSung/status/1782162352403828793)
- [Ladybird Browser](https://x.com/HeyPuter/status/1810783504503800035)
- [Garry's Mod](https://x.com/HeyPuter/status/1850587712786722862)
- [Samsung Q88BA](https://x.com/AmirIsAround/status/1862614583263076540)
214 changes: 214 additions & 0 deletions doc/File Structure.drawio

Large diffs are not rendered by default.

Binary file added doc/File Structure.drawio.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions doc/contributors/extensions.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
### `vscode`
- `es6-string-html`
## Puter Extensions

See the [Wiki Page](https://github.com/HeyPuter/puter/wiki/ex_extensions)
2 changes: 2 additions & 0 deletions doc/contributors/vscode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### `vscode`
- `es6-string-html`
9 changes: 9 additions & 0 deletions doc/i18n/README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ docker compose up
```
<br/>

## 宝塔面板Docker一键部署(推荐)

1. 安装宝塔面板9.2.0及以上版本,前往 [宝塔面板](https://www.bt.cn/new/download.html?r=dk_puter) 官网,选择正式版的脚本下载安装

2. 安装后登录宝塔面板,在左侧菜单栏中点击 `Docker`,首次进入会提示安装`Docker`服务,点击立即安装,按提示完成安装

3. 安装完成后在应用商店中搜索`puter`,点击安装,配置域名等基本信息即可完成安装


### ☁️ Puter.com

Puter 可以作为托管服务使用,访问 [**puter.com**](https://puter.com)
Expand Down
1 change: 0 additions & 1 deletion experiments/x86emu/www/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

#!/usr/bin/env node
/*
* Copyright (C) 2024 Puter Technologies Inc.
*
Expand Down
4 changes: 2 additions & 2 deletions mods/mods_available/kdmod/ShareTestService.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
// we have these things registered in "useapi".
const {
get_user,
generate_system_fsentries,
invalidate_cached_user,
deleteUser,
} = require('../../../src/backend/src/helpers.js');
Expand Down Expand Up @@ -146,7 +145,8 @@ class ShareTestService extends use.Service {
],
);
const user = await get_user({ username });
await generate_system_fsentries(user);
const svc_user = this.services.get('user');
await svc_user.generate_default_fsentries({ user });
invalidate_cached_user(user);
return user;
}
Expand Down
Loading

0 comments on commit c7fb334

Please sign in to comment.