Compare commits

...

11 commits

Author SHA1 Message Date
Lea 8eca3681b7
Update submodule to point to web-apps fork 2023-01-12 14:25:10 +01:00
github-actions[bot] da71b9c6f9 Update submodules 2022-12-20 12:55:42 +00:00
Denis Spitsyn ed60013250
Add v7.2.2 changelog (#2045)
* Add v7.2.2 changelog

Add v7.2.1 changelog

* Fix markdown

* Update spellchecker

* Fix more

* Fix spaces

* Add one more exception

* Remove non-unicode symbol
2022-12-20 10:35:58 +03:00
Pavel Lobashov 5bed65fa99
Add note about docker-engine (#1959) 2022-10-27 11:09:17 +03:00
github-actions[bot] 016eddbecb Update submodules 2022-10-20 15:59:05 +00:00
Pavel Lobashov f1b8594521
Add v7.2.1 changelog (#1945)
* Add v7.2.1 changelog

* Improve

* Fix more
2022-10-20 16:06:30 +03:00
Pavel Lobashov e448c88efa Add issue templates 2022-10-10 10:08:08 +03:00
Alexander Trofimov cfe62f0ede Update Readme.md
Update version to 7.2
2022-09-28 10:57:45 +03:00
github-actions[bot] 141067bf45 Update submodules 2022-09-22 12:56:44 +00:00
Pavel Lobashov 6eff0ebc83
Add v7.2.0 changelog (#1901)
* Add v7.2.0 changelog

* Fix wording

* Add more details in changelog

* Fix more

* Fix more

* Fix more

* Some  more

* Fix more

* Fix issues

* Fix more

* Fix more

* Add changelog for API

* Fix more

* Fix more

* Add link to new methods

* Add more details to changelog
2022-09-22 15:05:21 +03:00
Pavel Lobashov 6271653f61 Add note about E2E encryption
Some user noticed it that is was not very informative
Asked by Ksenia Fedoruk and user was from Ekaterina Orekhova
2022-07-11 14:17:58 +03:00
21 changed files with 478 additions and 20 deletions

View file

@ -1,22 +1,38 @@
personal_ws-1.1 en 526 utf-8
personal_ws-1.1 en 580 utf-8
ACOT
ACOTH
ActiveCell
AddBookmarkCrossRef
AddCaptionCrossRef
AddComment
AddEndnoteCrossRef
AddFootnoteCrossRef
AddHeadingCrossRef
AddNumberedCrossRef
AddSheet
adSm
AllFontsGen
altGr
amd
amqp
Api
ApiBlockLvlSdt
ApiChart
ApiDocument
ApiDrawing
ApiParagraph
ApiRange
ApiSlide
ApiTable
ApiWorksheet
ApplyChartStyle
ApplyTheme
Asana
ASC
ashx
aspose
Aspose
authChanges
autocomplete
AutoCorrect
autofill
@ -52,6 +68,7 @@ bugfixes
builded
callbackUrl
CanUpdateTarget
CAs
CentOS
cff
changesError
@ -64,6 +81,7 @@ CHISQ
CHITEST
citus
CJK
clientLog
clipart
Clipart
ClipArt
@ -85,11 +103,13 @@ ConnectionsOS
COnOfftype
convertasion
Convertation
convertions
ConvertService
COTH
COUNTIF
COUNTIFS
COVARIANCE
CreatePictureForm
crypted
CSC
CSCH
@ -155,6 +175,7 @@ ERFC
ESOCKETTIMEDOUT
Español
ETS
eu
EXC
EXPON
fb
@ -181,18 +202,26 @@ gc
gcc
GenerateGuid
GetAdress
GetAllCaptionParagraphs
GetAllHeadingParagraphs
GetAllNumberedParagraphs
GetBottomMargin
GetCells
GetCols
GetColumnWidth
GetCount
GetCurrentContentControlPr
GetEndNotesFirstParagraphs
GetFontNames
GetFootnotesFirstParagraphs
GetHeight
GetHidden
GetIndex
GetLeftMargin
getLocale
GetName
GetPageOrientation
GetPosInParent
GetRightMargin
GetRowHeight
GetRows
@ -205,6 +234,8 @@ GetTopMargin
GetUsedRange
GetValue
GetVisible
GetVisibleRegion
GetWidth
GetWpar
glyphs
gnutls
@ -222,6 +253,7 @@ hotkeys
html
htmlutils
https
hy
HYPGEOM
icu
ie
@ -239,9 +271,11 @@ inBody
innodependencyinstaller
InsertContent
insertImage
integrations
INTL
INV
iOS
iPadOS
ipfilter
IsAutosave
IsExitSave
@ -249,7 +283,9 @@ ISFORMULA
IsModifiedByUser
ISOWEEKNUM
isSaveLock
Italiano
japanese
javascript
jpeg
js
JS
@ -279,6 +315,7 @@ MacOs
mariadb
mathType
MathType
maxChangesSize
MAXIFS
Mendeley
MergeArea
@ -323,6 +360,7 @@ ODP
ods
odt
ODT
onDocumentContentReady
onDocumentStateChange
onlyoffice
ONLYOFFICE
@ -336,6 +374,7 @@ OpenDocument
OpenFormat
openProtectedFile
OpenSource
oRange
otp
ots
ott
@ -343,9 +382,11 @@ owncloud
oxps
pageDown
ParaDrawing
Paragarph
param
params
passsword
pathurl
pdf
PDFA
PDURATION
@ -356,6 +397,7 @@ PhotoEditor
PHP
placholder
Pluging
png
PNG
PostgreSql
PostgreSQL
@ -387,12 +429,14 @@ refactor
Refactor
refactoring
regex
ReplaceByElement
replyStr
republika
reSave
resize
rightMenu
RowHeight
rPrChange
RRI
rtf
RTF
@ -402,6 +446,7 @@ savefile
SaveLock
saveUrl
Schweiz
ScrollToAbsolutePosition
sdk
sdkjs
sdt
@ -412,14 +457,26 @@ SELinux
sessionId
SetBottomMargin
SetColumnWidth
SetDataPointFill
SetDataPointOutLine
SetHidden
SetLeftMargin
SetLegendFill
SetLegendOutLine
setLocale
setMailMergeRecipients
SetMarkerFill
SetMarkerOutLine
SetOffset
SetPageOrientation
SetPlotAreaFill
SetPlotAreaOutLine
SetRightMargin
SetRowHeight
SetSeriesFill
SetSeriesOutLine
SetTitleFill
SetTitleOutLine
SetTopMargin
SetVisible
SharedWorker
@ -429,6 +486,7 @@ shrinkwrap
si
SIGABR
signatureLine
Sinhala
Slovenčina
Slovenská
SmartArt
@ -446,6 +504,7 @@ specifi
Spellcheker
ssl
sslEnabled
startRPC
startup
statsd
statusBar
@ -458,6 +517,7 @@ Svenska
Sverige
svg
SVG
Svizzera
tabSelected
TDIST
TEXTJOIN
@ -474,6 +534,7 @@ TRIMMEAN
truetype
TTEST
ttf
TW
txPr
txt
ubuntu
@ -483,6 +544,7 @@ undelete
ungroup
ungrouping
unLockDocument
uri
URI
url
urls
@ -505,12 +567,14 @@ wget
WinXp
wmf
WOPI
WordControl
WrapText
xfIndexNumber
XLOOKUP
xls
XLS
XLSB
xlsb
XlsFormatReader
xlsx
XLSX
@ -523,5 +587,6 @@ yy
yyyy
ZA
Zb
zh
Zotero
ZTEST

63
.github/ISSUE_TEMPLATE/bug_report.yml vendored Normal file
View file

@ -0,0 +1,63 @@
name: "Bug report"
description: "Use this template if you're running into issues with DocumentServer"
body:
- type: checkboxes
id: unique
attributes:
label: "This issue is unique."
options:
- label: "I have used the [search tool](https://github.com/ONLYOFFICE/DocuemntServer/issues?q=) and did not find an issue describing my bug."
required: true
- type: dropdown
id: os
attributes:
label: Operating System of DocumentServer
description: "If you know this bug occurs on multiple operating systems, select all you have tested."
multiple: true
options:
- Windows Server
- Linux (DEB package)
- Linux (RPM package)
- Docker
validations:
required: true
- type: input
id: version
attributes:
label: "Version information"
description: "Please provide the exact version of the app you are using. You can check it in `About` tab"
placeholder: "Example: 6.3.1.56"
validations:
required: true
- type: textarea
id: expected
attributes:
label: "Expected Behavior"
description: "What did you expect to happen? Did this work in previous versions of DocumentServer?"
placeholder: "Example: When the text color is set to white it should be white, regardless of the font size."
validations:
required: true
- type: textarea
id: actual
attributes:
label: "Actual Behavior"
description: "What did actually happen?"
placeholder: "Example: When the text size is 16 and the font color is set to white then the text is gray."
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: "Reproduction Steps"
description: "Provide information on how to reproduce this bug. Make sure your instructions are clear."
placeholder: |
Example:
1. Change font size to 16
2. Set font color to white
3. Observe as the text is not white
- type: textarea
id: additional
attributes:
label: "Additional information"
description: "If you have any screenshots, videos, or other information that you feel is necessary to explain the issue, feel free to attach them here."
placeholder: "Example: My screen resolution is 1920x1080p"

View file

@ -0,0 +1,14 @@
name: "Feature request"
description: "Use this form to suggest a feature."
body:
- type: checkboxes
attributes:
label: "This issue is unique."
options:
- label: "I have used the [search tool](https://github.com/ONLYOFFICE/DocumentServer/issues?q=) and did not find an issue describing my idea."
required: true
- type: textarea
attributes:
label: Your idea.
validations:
required: true

2
.gitmodules vendored
View file

@ -15,7 +15,7 @@
url = https://github.com/ONLYOFFICE/server.git
[submodule "web-apps"]
path = web-apps
url = https://github.com/ONLYOFFICE/web-apps.git
url = https://git.amogus.cloud/Lea/web-apps.git
[submodule "sdkjs-plugins/plugin-highlightcode"]
path = sdkjs-plugins/plugin-highlightcode
url = https://github.com/ONLYOFFICE/plugin-highlightcode

View file

@ -1,5 +1,320 @@
# Change log
## 7.2.2
### Fixes
#### All Editors
* Change selection font for base math font
#### Document Editor
* Fix the document bouncing in fast co-edit mode (Bug #59647) ([DocumentServer#1955](https://github.com/ONLYOFFICE/DocumentServer/issues/1955))
* Fix ability to review the document by anonymous users (Bug #59592)
* Fix changing `Unit of Measurement` property in `Advanced Settings` (Bug #59911)
* Fix the problem with compiling text properties of paragraph numbering (Bug #59324)
* Fix comment highlight rendering (Bug #59640)
* Fix calculating end info of the paragraph (Bug #59997, #60026)
* Fix printing selection for some documents (Bug #60167)
* Fix calculating the end info of a paragraph in table (Bug #60115)
#### Spreadsheet Editor
* Fix print from the integrations (Bug #59466)
* Fix hangup on opening xlsx file (Bug #59549)
* Fix displaying of the descriptions in `Function Arguments` window
for non-English formula languages
#### Presentation Editor
* Fix applying auto-correction in the equations (Bug #59529) ([DocumentServer#1960](https://github.com/ONLYOFFICE/DocumentServer/issues/1960))
#### Convert
* Fix some specific files in docx to png conversion (Bug #59923)
#### Back-end
* Major improvements of js compilation during convertions
through creating js caches with fonts
* Fix file collection with setting `FileConverter.converter.errorfiles`
* Add idle session close log and `clientLog` command
* Add `onDocumentContentReady` log message
#### API
* Fix `GetVisibleRegion` method
* Add `WordControl.ScrollToAbsolutePosition` method
#### Mobile Web Editors
* Fix the editors loading in some integrations on iOS and iPadOS (Bug #59604)
#### Docker
* Fix port parsing from `amqp_uri` if host contains digits including IP (Bug #59483)([Docker-DocumentServer#215](https://github.com/ONLYOFFICE/Docker-DocumentServer/issues/215))
* Add base image and PostgreSQL version build arguments
* Fix errors when starting the container on CentOS 9 (Bug #59481)([Docker-DocumentServer#522](https://github.com/ONLYOFFICE/Docker-DocumentServer/issues/522))
#### Integration Example
* Fixed several issues with jwt in different examples
## 7.2.1
### New Features
#### All Editors
* Major improvements in fonts render engine. Removal of `Alternative input` settings
### Fixes
#### All Editors
* Fix `Help` closing (Bug #59315)
#### Document Editor
* Fix numbering in Portuguese or Basque language (Bug #59091)
* Fix the problem with review types when splitting paragraph (Bug #58512)
* Fix the problem with special paste button (Bug #59149)
* Fix crash on opening docx (Bug #59212)
* Fix the problem with reading `rPrChange` property and review such files (Bug #59205)
* Fix scrolling in co-edit view mode (Bug #57928)
* Fix the problem with performing the global undo (Bug #59270)
* Fix the problem with set the bold property for text in the complex script
(Bug #59289)
* Fix special paste position (Bug #59139)
#### Spreadsheet Editor
* Fix hangup on opening xlsx file (Bug #58112)
* Fix special paste via hotkey (Bug #59148)
#### Presentation Editor
* Fix animations problems (Bug #59301)
* Fix opening pptx file (Bug #59308)
#### Convert
* Fix xlsb to xlsx conversion (Bug #59002)
* Fix broken docx with 3D charts (Bug #58814)
* Fix some specific files in ppt to pptx conversion (Bug #59074, Bug #59106,
Bug #59108, Bug #59261, Bug #59276, Bug #59277, Bug #59281, #59261)
* Fix some specific files in xlsx to ods conversion (Bug #59118)
* Fix metadata loss in PDF (Bug #59153)
* Fix problems with opening xps files (Bug #59119)
* Fix empty presentation for ods to pptx conversion (Bug #59220)
* Fix xlsx to ods conversion (Bug #59221, Bug #59353)
* Fix xls to xlsx conversion (Bug #59209)
* Fix rtf to docx conversion (Bug #59322)
* Fix doc to docx conversion (Bug #59329)
* Fix csv number formats (Bug #59357)
* Improve EMF images rendering
#### PDF Viewer
* Fix search highlight (Bug #59069)
* Fix tooltip language for preview (Bug #59087)
#### Forms
* Major improvements in saving forms to PDF
* Implement save text field formats to PDF (Bug #58901)
* Add default form key when creating new forms
* Fix image track display (Bug #59120)
* Fix the problem with highlight of a fixed form (Bug #59105)
* Fix duplicating fixed forms when saving to PDF
* Fix the problem with converting complex field to fixed form (Bug #59262)
* Fix the problem with entering text to form (Bug #59290)
* Fix the problem with working with complex fields and simple fields (Bug #59345)
* Fix keys list problems (Bug #59377)
* Fix the problem with cancel filling the form on form blur (Bug #59373)
* Fix the problem with key of complex forms (Bug #59374)
* Fix complex form filling problem for forms with same key (Bug #59375)
* Fix the problem with printing form borders filled with placeholders (Bug #59378)
* Fix the problem with updating content of a Ref field (Bug #58606, Bug #59278)
#### Back-end
* Calling separate callback for each `pathurl` request
* Fix forgotten migration ([DocumentServer#1911](https://github.com/ONLYOFFICE/DocumentServer/issues/1911))
* Set timeout for entire conversion
* Add `pathurl` command to startRPC
* Check connection status before sending changes
* Add `editor.maxChangesSize` limit to document changes in config
* Fix bug with using built-in Root CAs instead of Windows Store.
* Check license on live viewer authorization
* Add alias field for multi tenancy
* Add acknowledge to authChanges
#### API
* Fix `Api.CreatePictureForm` method (Bug #59159)
* New methods to work with Review mode via API
#### Mobile Web Editors
* Fix SmartArt rendering (Bug #58867)
* Fix hangup on duplicate slide (Bug #59102)
* Fix hidden separator in dark theme (Bug #58272)
#### Docker
* Update base image to `ubuntu:22.04`. Please update `docker-engine`
to latest stable version (`20.10.21` as of writing this doc)
* Fix build of image (Bug #59310)([Docker-DocumentServer#506](https://github.com/ONLYOFFICE/Docker-DocumentServer/issues/506))
#### Integration Example
* Fixed several issues in different examples
## 7.2.0
### New Features
#### All Editors
* JWT with random key enabled by default. This fix CVE-2021-43445,
CVE-2021-43447, CVE-2021-43448, CVE-2021-43449
* Random secret key by default. Fix CVE-2021-43444
* Fix CVE-2022-32212 by upgrading nodejs version
* Show warning on macros execution if connection to another host. Fix CVE-2021-43446
* Top toolbar optimizations for smaller screens
* Added the ability to choose "Contrast Dark" or "System default"
interface theme (Bug 59010)
* More options in `View` tab. View tab available in comment and view mode
* Redone of icons in header line
* Ability to rename file from header (Should be supported by DMS)
* Redone of settings page
* Exact build number in `About` page
* New `Live viewer` - ability to see changes in view mode
(Should be supported by DMS)
* Stat page will show statistics for `Live viewer`
* New interface languages - `pt-PT`, `zh-TW`, `eu-ES`, `ms-MY`, `hy-AM`
* Redone of color selection component
* New option to disable alternative menu
* Completely redesigned search inside the document
* New hotkeys for `Special Paste`
* Added `Cut` and `Select All` buttons to the toolbar next to `Copy`\`Paste`
* Major improvements in Font engine (For languages like Bengali or Sinhala)
(Only in Document Editor and Presentation Editor)
* Ligatures support
* Ability to insert tables as OLE object
* Support for images as a bulleted list and the ability to work with them
* Major improvements in `EMF` and `WMF` files rendering
* Completely new plugin marketplace
#### Document Editor
* Ability to remove Header/Footer from toolbar
* Ability to insert current heading in TOC
* New warning if there is no TOC in document
* Navigation panel renamed to `Headings`
* Major improvements in `pdf`, `djvu`, `xps` convert to `docx`
* Correct display Greek letters as numbered list items
* New types of multilevel lists, which can be applied to Headers
* Redone changes apply in Review mode
##### Spreadsheet Editor
* Ability to `Switch rows and columns` for Chart
* New `Italiano (Svizzera)` language for regional settings
* Row number highlight for filter
* Remove `First sheet` and `Last sheet` from bottom toolbar
* Selection of copied range
* `Get link to this range` in context menu
* Pivot table option - `Auto-fit column widths on update`
* 1904 date system support
##### Presentation Editor
* Animation with Custom path
* New advanced settings `Placement` tab for shapes\charts\images
#### Forms
* Search in embedded and forms mode
* Change field width for `Comb of characters`-enabled field
* Ability to set tag for field
* New `Format` and `Allowed Symbols` settings for field
* New field types - `Phone number`, `Email Address` and `Complex Field`
##### Installation
* Auto detect of DB type in `deb` package
* `arm64` and `amd64` docker images use same tag
###### Back-end
* `WOPI` discovery action for embedded viewer
##### Customization
* Ability to set phone in `About` page
##### Api
* `GetFontNames()` methods for `Paragarph` and `Run`
* New methods to get cross-reference data:
`ApiDocument.GetAllNumberedParagraphs();`,
`ApiDocument.GetAllHeadingParagraphs();`,
`ApiDocument.GetFootnotesFirstParagraphs();`,
`ApiDocument.GetEndNotesFirstParagraphs();`,
`ApiDocument.GetAllCaptionParagraphs();`
* New methods to set cross-reference data:
`ApiParagraph.AddNumberedCrossRef();`,
`ApiParagraph.AddHeadingCrossRef();`,
`ApiParagraph.AddBookmarkCrossRef();`,
`ApiParagraph.AddFootnoteCrossRef();`,
`ApiParagraph.AddEndnoteCrossRef();`,
`ApiParagraph.AddCaptionCrossRef();`
* New methods to replace elements:
```javascript
ApiParagraph.GetPosInParent();
ApiParagraph.ReplaceByElement();
ApiTable.GetPosInParent();
ApiTable.ReplaceByElement();
ApiBlockLvlSdt.GetPosInParent();
ApiBlockLvlSdt.ReplaceByElement();
```
* New methods to get size in EMU for drawings
`ApiDrawing.GetWidth();` and `ApiDrawing.GetHeight();`
* Add new methods for chart:
```javascript
ApiChart.ApplyChartStyle();
ApiChart.SetPlotAreaFill();
ApiChart.SetPlotAreaOutLine();
ApiChart.SetSeriesFill();
ApiChart.SetSeriesOutLine();
ApiChart.SetDataPointFill();
ApiChart.SetDataPointOutLine();
ApiChart.SetMarkerFill();
ApiChart.SetMarkerOutLine();
ApiChart.SetTitleFill();
ApiChart.SetTitleOutLine();
ApiChart.SetLegendFill();
ApiChart.SetLegendOutLine();
```
* Improve support of regexps in code like `String.replace(/\s/g, "")`
* Improvements in `oRange.GetValue` and `oRange.GetValue2`
* Dozens of new methods for different objects.
More detailed list at [here](https://api.onlyoffice.com/docbuilder/changelog)
* Fixes for several methods
### Fixes
* All components received countless fixes
## 7.1.1
### Fixes

View file

@ -1,4 +1,4 @@
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html) ![Release](https://img.shields.io/badge/Release-v7.1.0-blue.svg?style=flat)
[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](https://www.gnu.org/licenses/agpl-3.0.en.html) ![Release](https://img.shields.io/badge/Release-v7.2.0-blue.svg?style=flat)
## Overview
@ -111,10 +111,11 @@ The table below will help you to make the right choice.
| Form preview | + | + | + |
| Saving as PDF | + | + | + |
| **Security features** | **Community Edition** | **Enterprise Edition** | **Developer Edition** |
| End-to-end encryption via Private Rooms | + | + | - |
| End-to-end encryption via Private Rooms** | + | + | - |
| | [Get it now](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubDS#docs-community) | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubDS#docs-enterprise) | [Start Free Trial](https://www.onlyoffice.com/download-docs.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubDS#docs-developer) |
\* If supported by DMS
\* If supported by DMS
\** End-to-end encryption via Private Rooms requires ONLYOFFICE Workspace
## Documentation

2
core

@ -1 +1 @@
Subproject commit 57b89540f750c567a1d322ed787a9658e9b05ca8
Subproject commit 24e04314d878b8efc5ef4cb9c1a20331497071ea

@ -1 +1 @@
Subproject commit 6422d90aa029eb011040509d75aa67e2ee9bf074
Subproject commit 4fa8601cc3f29477fe589d5970613e67e79c5d01

2
sdkjs

@ -1 +1 @@
Subproject commit 87d3f0154f613ac750605e722c0855c458093d8d
Subproject commit 2f7a18f583853b15c5a05ff357f3e1bc15b726c7

@ -1 +1 @@
Subproject commit 7ea4ddf1e1562cee66fbbb339dcc2c2a25990249
Subproject commit bf800f63eab8a202128f109c1b4969e654ccb314

@ -1 +1 @@
Subproject commit f8627617fd83b2ac06d7961df3ac59462f92d825
Subproject commit 3e21f9f542eb7d1709622b29a92e4eff1c3ea612

@ -1 +1 @@
Subproject commit e1d239af85a5ff538a5046163040dee86ee929e1
Subproject commit de282e12466fca0cc79f8f79072b8630df9c7932

@ -1 +1 @@
Subproject commit 5b24c872e1cc2a52a8e17c6d337b96bc40ccbf47
Subproject commit 1e7abae692c74a8e036cb8472c53223d3df41d14

@ -1 +1 @@
Subproject commit 995b5f62152f86b2663ebe702f3cbeece79e3d5b
Subproject commit 10c89498b702f271183427957e2a66558e93eced

@ -1 +1 @@
Subproject commit 0db743934ca6c9a60b99103c9a4afa2ebad25ffd
Subproject commit b1abf1a37a5d856e7f926ad0ab90bc8d2a6b18a9

@ -1 +1 @@
Subproject commit 4ada28009a1cd1c79acea3b9a534e24f454ef084
Subproject commit 46e05265cb1186197184943f118caac9ab478aed

@ -1 +1 @@
Subproject commit c05e8cde0f31dab988a17b0e2500ce1a9ede61c8
Subproject commit dfefba29ccae8796de31b06131dfb2a6416fa6ea

@ -1 +1 @@
Subproject commit a52a8b58b3bb29700484d685924d4a6cb169c06e
Subproject commit 502922f92ad5a365163f316897677a470daf80f1

@ -1 +1 @@
Subproject commit c9f472fea4e36b5287df13a8767137d8b92742e5
Subproject commit 5f729fda60d65a18064a258b5bf764e81c7de774

2
server

@ -1 +1 @@
Subproject commit 3b6f8f473cd9e21a58972e6979a24f1377e56d1b
Subproject commit 1a1cbf19681318eafd73c6a03c68afe3d6d67aa2

@ -1 +1 @@
Subproject commit da621613448abc07d9d18f51eec30eaeed76da80
Subproject commit ddec589b37b29ae93b699ea6797f1e375486abdc