Merge branch 'master' into 16-vcl-network-disconnection-issue-and-authentication (2b134e8d) · Commits · Code / Vereign Client Library · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

Vereign Client Library
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

2b134e8d

Commit 2b134e8d authored 6 years ago by Alexey Lunin

Downloads
- Plain Diff

Merge branch 'master' into 16-vcl-network-disconnection-issue-and-authentication

# Conflicts:
#	javascript/src/iframe/viamapi-iframe.js

parents be04bba0 f867fe34

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

javascript/package.json 1 addition, 0 deletions

javascript/package.json
javascript/src/constants/statuses.js 1 addition, 0 deletions

javascript/src/constants/statuses.js
javascript/src/iframe/viamapi-iframe.js 167 additions, 41 deletions

javascript/src/iframe/viamapi-iframe.js
javascript/src/iframe/wopiapi-iframe.js 21 additions, 0 deletions

javascript/src/iframe/wopiapi-iframe.js
main.go 22 additions, 74 deletions

main.go

with 212 additions and 115 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