Merge pull request #17 from opendesktop/develop (8b60821f) · Commits · DFN2 / ocs-manager · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

ocs-manager
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Repositories are limited in size now to 1GB. If your repository exceeds this size, it will be automatically deleted.

Admin message

If you'd like access to our CI/CD builders, please create an issue here.

8b60821f

Unverified Commit 8b60821f authored 7 years ago by akiraohgaki Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #17 from opendesktop/develop

Develop

parents 3dfd4d75 5a1435ac

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/app.pri 2 additions, 0 deletions

app/app.pri
app/configs/application.json 1 addition, 1 deletion

app/configs/application.json
app/src/handlers/updatehandler.cpp 65 additions, 79 deletions

app/src/handlers/updatehandler.cpp
app/src/handlers/updatehandler.h 16 additions, 7 deletions

app/src/handlers/updatehandler.h
app/src/updaters/appimageupdater.cpp 91 additions, 0 deletions

app/src/updaters/appimageupdater.cpp
app/src/updaters/appimageupdater.h 41 additions, 0 deletions

app/src/updaters/appimageupdater.h
app/src/websockets/websocketserver.cpp 9 additions, 5 deletions

app/src/websockets/websocketserver.cpp
app/src/websockets/websocketserver.h 5 additions, 5 deletions

app/src/websockets/websocketserver.h
pkg/appimage/appimage.sh 1 addition, 1 deletion

pkg/appimage/appimage.sh

with 231 additions and 98 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment