Skip to content

Commit 4af422a

Browse files
LinneySLinneyS
committed
Merge pull request 'release/1.13.0' from release/1.13.0 into master
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/60
2 parents 1074735 + 6bac7ff commit 4af422a

File tree

743 files changed

+41478
-1083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

743 files changed

+41478
-1083
lines changed

‎.github/workflows/artifact-csharp-mvc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
2626
rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: DotNet.Csharp.MVC.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/csharp-mvc/deploy

‎.github/workflows/artifact-csharp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
2525
rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
2626
- name: Upload Artifact
27-
uses: actions/upload-artifact@v3
27+
uses: actions/upload-artifact@v4
2828
with:
2929
name: DotNet.Csharp.Example
3030
path: ${{ github.workspace }}/web/documentserver-example/csharp/deploy

‎.github/workflows/artifact-java.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
2626
rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: Java.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/java/deploy

‎.github/workflows/artifact-node.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
2626
rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: Node.js.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/nodejs/deploy

‎.github/workflows/artifact-php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
2626
rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: PHP.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/php/deploy

‎.github/workflows/artifact-python.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rm -rf ./deploy/'Python Example'/assets/document-formats/.git
2626
rm -rf ./deploy/'Python Example'/assets/document-templates/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: Python.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/python/deploy

‎.github/workflows/artifact-ruby.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
2626
rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
2727
- name: Upload Artifact
28-
uses: actions/upload-artifact@v3
28+
uses: actions/upload-artifact@v4
2929
with:
3030
name: Ruby.Example
3131
path: ${{ github.workspace }}/web/documentserver-example/ruby/deploy

‎.github/workflows/artifact-spring.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
2727
rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
2828
- name: Upload Artifact
29-
uses: actions/upload-artifact@v3
29+
uses: actions/upload-artifact@v4
3030
with:
3131
name: Java.Spring.Example
3232
path: ${{ github.workspace }}/web/documentserver-example/java-spring/deploy

‎.github/workflows/lint-php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
working-directory: ./web/documentserver-example/php
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Setup PHP
2323
uses: shivammathur/setup-php@v2

‎.github/workflows/release.yml

+23-1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ jobs:
6363
rsync -av --exclude='PHP Example' ./ ./'PHP Example'
6464
rm -rf ./'PHP Example'/assets/document-formats/.git
6565
rm -rf ./'PHP Example'/assets/document-templates/.git
66+
- name: Build PHP Laravel Artifact
67+
run: |
68+
cd ${{ github.workspace }}
69+
cd ./web/documentserver-example/php-laravel
70+
mkdir -p ./'PHP Laravel Example'
71+
rsync -av --exclude='PHP Laravel Example' ./ ./'PHP Laravel Example'
72+
rm -rf ./'PHP Laravel Example'/public/assets/document-formats/.git
73+
rm -rf ./'PHP Laravel Example'/public/assets/document-templates/.git
6674
- name: Build Python Artifact
6775
run: |
6876
cd ${{ github.workspace }}
@@ -87,6 +95,14 @@ jobs:
8795
rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
8896
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
8997
rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.git
98+
- name: Build Go Artifact
99+
run: |
100+
cd ${{ github.workspace }}
101+
cd ./web/documentserver-example/go
102+
mkdir -p .'Go Example'
103+
rsync -av --exclude='Go Example' ./ ./'Go Example'
104+
rm -rf ./'Go Example'/static/assets/document-formats/.git
105+
rm -rf ./'Go Example'/static/assets/document-templates/.git
90106
- name: Pack Artifacts
91107
run: |
92108
cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc
@@ -99,12 +115,16 @@ jobs:
99115
zip -r Node.js.Example.zip ./'Node.js Example'
100116
cd ${{ github.workspace }}/web/documentserver-example/php
101117
zip -r PHP.Example.zip ./'PHP Example'
118+
cd ${{ github.workspace }}/web/documentserver-example/php-laravel
119+
zip -r PHP.Laravel.Example.zip ./'PHP Laravel Example'
102120
cd ${{ github.workspace }}/web/documentserver-example/python
103121
zip -r Python.Example.zip ./'Python Example'
104122
cd ${{ github.workspace }}/web/documentserver-example/ruby
105123
zip -r Ruby.Example.zip ./'Ruby Example'
106124
cd ${{ github.workspace }}/web/documentserver-example/java-spring
107125
zip -r Java.Spring.Example.zip ./'Java Spring Example'
126+
cd ${{ github.workspace }}/web/documentserver-example/go
127+
zip -r Go.Example.zip ./'Go Example'
108128
- name: Create Release
109129
uses: ncipollo/release-action@v1
110130
id: create_release
@@ -116,8 +136,10 @@ jobs:
116136
${{ github.workspace }}/web/documentserver-example/java/Java.Example.zip,
117137
${{ github.workspace }}/web/documentserver-example/nodejs/Node.js.Example.zip,
118138
${{ github.workspace }}/web/documentserver-example/php/PHP.Example.zip,
139+
${{ github.workspace }}/web/documentserver-example/php-laravel/PHP.Laravel.Example.zip,
119140
${{ github.workspace }}/web/documentserver-example/python/Python.Example.zip,
120141
${{ github.workspace }}/web/documentserver-example/ruby/Ruby.Example.zip,
121-
${{ github.workspace }}/web/documentserver-example/java-spring/Java.Spring.Example.zip
142+
${{ github.workspace }}/web/documentserver-example/java-spring/Java.Spring.Example.zip,
143+
${{ github.workspace }}/web/documentserver-example/go/Go.Example.zip
122144
"
123145
tag: v${{ steps.info.outputs.version }}

‎.gitmodules

+11-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
[submodule "web/documentserver-example/php/assets/document-formats"]
2020
path = web/documentserver-example/php/assets/document-formats
2121
url = https://github.com/ONLYOFFICE/document-formats
22-
branch = master
2322
[submodule "web/documentserver-example/python/assets/document-templates"]
2423
path = web/documentserver-example/python/assets/document-templates
2524
url = https://github.com/ONLYOFFICE/document-templates
@@ -36,22 +35,30 @@
3635
path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
3736
url = https://github.com/ONLYOFFICE/document-templates
3837
branch = main/default
38+
[submodule "web/documentserver-example/go/static/assets/document-templates"]
39+
path = web/documentserver-example/go/static/assets/document-templates
40+
url = https://github.com/ONLYOFFICE/document-templates
41+
branch = main/default
42+
[submodule "web/documentserver-example/go/static/assets/document-formats"]
43+
path = web/documentserver-example/go/static/assets/document-formats
44+
url = https://github.com/ONLYOFFICE/document-formats
3945
[submodule "web/documentserver-example/python/assets/document-formats"]
4046
path = web/documentserver-example/python/assets/document-formats
4147
url = https://github.com/ONLYOFFICE/document-formats
42-
branch = master
4348
[submodule "web/documentserver-example/ruby/assets/document-formats"]
4449
path = web/documentserver-example/ruby/assets/document-formats
4550
url = https://github.com/ONLYOFFICE/document-formats
46-
branch = master
4751
[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
4852
path = web/documentserver-example/java/src/main/resources/assets/document-formats
4953
url = https://github.com/ONLYOFFICE/document-formats
50-
branch = master
5154
[submodule "web/documentserver-example/csharp/assets/document-templates"]
5255
path = web/documentserver-example/csharp/assets/document-templates
5356
url = https://github.com/ONLYOFFICE/document-templates
5457
branch = main/default
5558
[submodule "web/documentserver-example/csharp/assets/document-formats"]
5659
path = web/documentserver-example/csharp/assets/document-formats
5760
url = https://github.com/ONLYOFFICE/document-formats
61+
[submodule "web/documentserver-example/php-laravel/public/assets/document-templates"]
62+
path = web/documentserver-example/php-laravel/public/assets/document-templates
63+
url = https://github.com/ONLYOFFICE/document-templates
64+
branch = main/default

‎3rd-Party.license

+66
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,37 @@ License: MICROSOFT .NET LIBRARY LICENSE
8282
License File: WebGrease.license
8383

8484

85+
web/documentserver-example/go
86+
87+
fx - An application framework for Go that makes dependency injection easy. (https://github.com/uber-go/fx).
88+
License: MIT
89+
License File: fx.license
90+
91+
golang-jwt - A go implementation of JSON Web Tokens. (https://github.com/golang-jwt/jwt).
92+
License: MIT
93+
License File: golang-jwt.license
94+
95+
gorilla/mux - Package gorilla/mux implements a request router and dispatcher for matching incoming requests to their respective handler. (https://github.com/gorilla/mux).
96+
License: BSD-3-Clause License
97+
License File: mux.license
98+
99+
mapstructure - Go library for decoding generic map values into native Go structures and vice versa. (https://github.com/mitchellh/mapstructure)
100+
License: MIT
101+
License File: mapstructure.license
102+
103+
schema - Package gorilla/schema fills a struct with form values. (https://github.com/gorilla/schema)
104+
License: BSD-3-Clause License
105+
License File: schema.license
106+
107+
viper - Viper is a complete configuration solution for Go applications including 12-Factor apps. It is designed to work within an application, and can handle all types of configuration needs and formats. (https://github.com/spf13/viper).
108+
License: MIT
109+
License File: viper.license
110+
111+
zap - Blazing fast, structured, leveled logging in Go. (https://github.com/uber-go/zap).
112+
License: MIT
113+
License File: zap.license
114+
115+
85116
web/documentserver-example/java
86117

87118
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
@@ -330,6 +361,41 @@ License: MIT
330361
License File: serializer.license
331362

332363

364+
web/documentserver-example/php-laravel
365+
366+
jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
367+
License: MIT, GPL
368+
License File: jQuery.BlockUI.license
369+
370+
jQuery.FileUpload - File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads. (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
371+
License: MIT
372+
License File: jQuery.FileUpload.license
373+
374+
jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
375+
License: MIT
376+
License File: jQuery.iframe-transport.license
377+
378+
jQuery - jQuery is a new kind of JavaScript Library. jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript. NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
379+
License: MIT
380+
License File: jQuery.license
381+
382+
jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
383+
License: OpenJS
384+
License File: jQuery.Migrate.license
385+
386+
jQuery.UI - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
387+
License: MIT
388+
License File: jQuery.UI.license
389+
390+
JWT - PHP package for JWT (https://github.com/firebase/php-jwt/blob/main/LICENSE)
391+
License: BSD-3-Clause
392+
License File: jwt.license
393+
394+
Laravel - Laravel is a web application framework with expressive, elegant syntax. We’ve already laid the foundation for your next big idea — freeing you to create without sweating the small things. (https://github.com/laravel/framework/blob/master/LICENSE.md)
395+
License - MIT
396+
License File - laravel.license
397+
398+
333399
web/documentserver-example/python
334400

335401
django-stubs - PEP-484 stubs for Django. (https://github.com/typeddjango/django-stubs/blob/master/LICENSE.md)

‎CHANGELOG.md

+33-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
# Change Log
22

3+
## 1.13.0
4+
- nodejs: rename in wopi
5+
- nodejs: using faviconUrl from WOPI discovery
6+
- nodejs: wopi proof key verification
7+
- golang: new integration example
8+
- golang: upload files to the server
9+
- golang: create blank files and files with sample content
10+
- golang: edit uploaded files in onlyoffice editor
11+
- golang: delete files on the server
12+
- golang: show files history
13+
- php-laravel: new integration example
14+
- php-laravel: upload files to the server
15+
- php-laravel: create blank files and files with sample content
16+
- php-laravel: edit uploaded files in onlyoffice editor
17+
- php-laravel: delete files on the server
18+
- php-laravel: create, edit, and submit pdf forms
19+
- php-laravel: show forgotten files on a seperate page
20+
- php-laravel: fetch files
21+
- php-laravel: integrate sdk
22+
- jwt token lifetime from config
23+
- onUserActionRequired
24+
- support pages, numbers, key formats
25+
- support hwp, hwpx formats
26+
- restore by url
27+
- refresh config
28+
- on uploading xml convert to supported type only
29+
- converting function on index page
30+
- editing by default
31+
- change reference source
32+
- filename in editor page title
33+
- close editor
34+
335
## 1.12.0
436
- nodejs: refresh config
537
- nodejs: support pages, numbers, key formats
@@ -39,8 +71,7 @@
3971
- nodejs: pdf, djvu, xps, oxps as pdf documentType
4072
- nodejs: filling pdf
4173
- version number to page meta
42-
- ar skin languages
43-
- sr-Latn-RS skin languages
74+
- ar, sr-Latn-RS skin languages
4475
- getting history via api
4576
- using a repo with a list of formats
4677
- convert after uploading only tagged formats

‎Readme.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ Do NOT use these integration examples on your own server without proper code mod
55
In case you enabled any of the test examples, disable it before going for production.
66

77
These examples show the way to integrate [ONLYOFFICE Docs][2] into your own website or application using one of the programming languages.
8-
The package contains examples written in .Net (C# MVC), .Net (C#), Java, Java Spring, Node.js, PHP, Python and Ruby.
8+
The package contains examples written in .Net (C# MVC), .Net (C#), Go, Java, Java Spring, Node.js, PHP, PHP (Laravel), Python and Ruby.
99

1010
You should change `http://documentserver` to your server address in these files:
1111
* [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
1212
* [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
13+
* [Go](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/go) - `web\documentserver-example\go\config\configuration.json`
1314
* [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
1415
* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
1516
* [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
1617
* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
18+
* [PHP (Laravel)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php-laravel) - `web/documentserver-example/php-laravel/.env.example`
1719
* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
1820
* [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
1921

‎web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* (c) Copyright Ascensio System SIA 2024
3+
* (c) Copyright Ascensio System SIA 2025
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎web/documentserver-example/csharp-mvc/App_Start/FilterConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* (c) Copyright Ascensio System SIA 2024
3+
* (c) Copyright Ascensio System SIA 2025
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎web/documentserver-example/csharp-mvc/App_Start/RouteConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* (c) Copyright Ascensio System SIA 2024
3+
* (c) Copyright Ascensio System SIA 2025
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎web/documentserver-example/csharp-mvc/App_Start/WebApiConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* (c) Copyright Ascensio System SIA 2024
3+
* (c) Copyright Ascensio System SIA 2025
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

‎web/documentserver-example/csharp-mvc/Content/editor.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
*
3-
* (c) Copyright Ascensio System SIA 2024
3+
* (c) Copyright Ascensio System SIA 2025
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)