Merge pull request #7 from opendesktop/develop (a14fd5fd) · Commits · akiraohgaki / 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.

a14fd5fd

Commit a14fd5fd authored 7 years ago by akiraohgaki Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #7 from opendesktop/develop

Develop

parents a9b5b495 018845eb

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

app/configs/application.json
app/src/handlers/itemhandler.h 3 additions, 3 deletions

app/src/handlers/itemhandler.h
app/src/handlers/ocsapihandler.h 3 additions, 3 deletions

app/src/handlers/ocsapihandler.h
app/src/handlers/systemhandler.cpp 99 additions, 123 deletions

app/src/handlers/systemhandler.cpp
app/src/handlers/systemhandler.h 15 additions, 8 deletions

app/src/handlers/systemhandler.h
app/src/websockets/websocketserver.cpp 4 additions, 0 deletions

app/src/websockets/websocketserver.cpp
app/src/websockets/websocketserver.h 1 addition, 1 deletion

app/src/websockets/websocketserver.h
scripts/import.sh 1 addition, 1 deletion

scripts/import.sh

with 127 additions and 140 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