Compare commits

..

13 Commits

21 changed files with 85 additions and 24 deletions

27
.github/workflows/create-tag.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: Create Tag
on:
push:
branches: [master]
paths-ignore:
- '.github/**'
- '**/AUTHORS.md'
- '**/LICENSE'
- '**/README.md'
jobs:
create-tag:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Get Info
run: |
echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
id: info
- name: Create Tag
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
git tag -a 'v${{ steps.info.outputs.version }}' -m 'Release/v${{ steps.info.outputs.version }}'
git push origin 'v${{ steps.info.outputs.version }}'

View File

@ -2,7 +2,8 @@ name: Release
on:
push:
branches: [master]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
permissions:
contents: write

1
.gitmodules vendored
View File

@ -5,7 +5,6 @@
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
path = web/documentserver-example/nodejs/public/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats
branch = feature/v9.0
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
path = web/documentserver-example/csharp-mvc/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates

View File

@ -1,14 +1,16 @@
# Change Log
- ur skin language
## 1.14.0
- nodejs: set users by parts
- nodejs: preload frame moved from uploading popap
- change preload.html address
- nodejs: view odg
- nodejs: view odg, md
- nodejs: edit xlsb
- nodejs: support vsdx in diagram editor
- nodejs: fix wopi verification
- nodejs: user role
- nodejs: start filling
- ur skin language
- change preload.html address
## 1.13.0
- nodejs: rename in wopi

View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<appSettings>
<clear />
<add key="version" value="1.13.0"/>
<add key="version" value="1.14.0"/>
<add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<appSettings>
<clear />
<add key="version" value="1.13.0"/>
<add key="version" value="1.14.0"/>
<add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/>

View File

@ -1,5 +1,5 @@
{
"VERSION": "1.13.0",
"VERSION": "1.14.0",
"SERVER_ADDRESS" : "",
"SERVER_PORT" : 3000,

View File

@ -1,4 +1,4 @@
server.version=1.13.0
server.version=1.14.0
server.address=
server.port=4000

View File

@ -1,4 +1,4 @@
version=1.13.0
version=1.14.0
filesize-max=5242880
storage-folder=app_data

View File

@ -1,5 +1,5 @@
{
"version": "1.13.0",
"version": "1.14.0",
"log": {
"appenders": [
{

View File

@ -156,7 +156,7 @@ const users = [
{ text: 'Go to Documents' },
{},
true,
[ 'Anyone' ],
['Anyone'],
),
new User(
'uid-3',
@ -178,7 +178,7 @@ const users = [
null,
{},
false,
[ 'role' ],
['role'],
),
new User('uid-0', null, null, null, null, {}, [], null, ['protect'], descrUser0, false, false, null, null, false, []),
];

View File

@ -19,7 +19,7 @@
var language;
var userid;
var directUrl;
var formatManager;
var formatManager = new FormatManager();
window.onload = function () {
fetch('formats')
@ -38,7 +38,12 @@ window.onload = function () {
});
formatManager = new FormatManager(formats);
}
})
});
var urlScripts = jq("#loadScripts").attr("data-docs");
var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
jq("#loadScripts").html(frame);
jq("#loadScripts iframe").attr("src", urlScripts);
}
if (typeof jQuery != "undefined") {

View File

@ -526,6 +526,10 @@ label .checkbox {
line-height: 150%;
}
#loadScripts {
display: none;
}
#iframeScripts {
position: absolute;
visibility: hidden;

View File

@ -225,10 +225,33 @@
users = <%- JSON.stringify(usersForMentions) %>;
}
docEditor.setUsers({
if ((c === "protect" || c === "mention") && users && event.data.count) {
let from = event.data.from;
let count = event.data.count;
let search = event.data.search;
if (from != 0) users = [];
var resultCount = 234;
for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){
users.push({
email: "test@test.test" + (i + 1),
id: "id" + (i + 1),
name: "test_" + search + (i + 1)
});
}
}
var result = {
"c": c,
"users": users,
});
};
if (resultCount) {
// support v9.0
result.total = 1 + (!event.data.count || users.length < event.data.count ? 0 : (event.data.from + event.data.count));
// since v9.0.1
result.isPaginated = true;
}
docEditor.setUsers(result);
};
var onRequestSendNotify = function(event) { // the user is mentioned in a comment

View File

@ -366,7 +366,7 @@
</div>
</div>
<iframe id="iframeScripts" src="<%= preloaderUrl %>" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>
<span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>
<footer>
<div class="center">

View File

@ -252,7 +252,7 @@
<div id="cancelEdit" class="button gray">Cancel</div>
</div>
<iframe id="iframeScripts" src="<%= preloaderUrl %>" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>
<span id="loadScripts" data-docs="<%= preloaderUrl %>"></span>
<footer>
<div class="center">

View File

@ -16,7 +16,7 @@ DOCUMENT_STORAGE_DISPLAY_FORGOTTEN_PAGE=false
## DOCUMENT SERVER ENV VARIABLES
DOCUMENT_SERVER_VERSION=1.13.0
DOCUMENT_SERVER_VERSION=1.14.0
DOCUMENT_SERVER_PUBLIC_URL=http://localhost:8080
DOCUMENT_SERVER_PRIVATE_URL=http://proxy:8080

View File

@ -22,7 +22,7 @@ use Example\Common\URL;
class ConfigurationManager
{
public string $version = '1.13.0';
public string $version = '1.14.0';
public function getVersion(): string
{

View File

@ -22,7 +22,7 @@ from src.common import string
class ConfigurationManager:
version = '1.13.0'
version = '1.14.0'
def getVersion(self) -> str:
return self.version

View File

@ -31,7 +31,7 @@ class ConfigurationManager
sig { void }
def initialize
@version = '1.13.0'
@version = '1.14.0'
end
sig { returns(T.nilable(URI::Generic)) }