Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

pling-store-development
- Activity
- Members
- Labels
- Environments
- Terraform modules
- 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.

9de73074

Commit 9de73074 authored 5 years ago by DFN2

Downloads
- Plain Diff

Merge branch 'merge_browser_view' into 'master'

Merge browser view

See merge request dfn2/pling-store!2

parents f3bdd657 e559abe1

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/configs/application.json 2 additions, 2 deletions

app/configs/application.json
app/main.js 170 additions, 38 deletions

app/main.js
app/scripts/components/AboutdialogComponent.js 1 addition, 1 deletion

app/scripts/components/AboutdialogComponent.js
app/scripts/components/OmniboxComponent.js 20 additions, 20 deletions

app/scripts/components/OmniboxComponent.js
app/scripts/components/RootComponent.js 5 additions, 3 deletions

app/scripts/components/RootComponent.js
app/scripts/components/SplashscreenComponent.js 4 additions, 4 deletions

app/scripts/components/SplashscreenComponent.js
app/scripts/components/ToolbarComponent.js 32 additions, 32 deletions

app/scripts/components/ToolbarComponent.js
app/scripts/components/index.js 0 additions, 3 deletions

app/scripts/components/index.js
app/scripts/handlers/BrowserViewHandler.js 69 additions, 0 deletions

app/scripts/handlers/BrowserViewHandler.js
app/scripts/handlers/OcsManagerHandler.js 12 additions, 26 deletions

app/scripts/handlers/OcsManagerHandler.js
app/scripts/renderers/browser-view.js 0 additions, 0 deletions

app/scripts/renderers/browser-view.js

with 315 additions and 129 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