Commit Graph

22889 Commits

Author SHA1 Message Date
58d3407729 fix 2022-08-01 13:58:14 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00
28d8c4b4a9
Merge pull request #746 from ONLYOFFICE/feature/pool-context
Feature/pool context
2022-08-01 13:15:10 +03:00
d406e8deb5 Merge branch 'develop' into feature/pool-context 2022-08-01 13:14:47 +03:00
b71611e272
Merge pull request #744 from ONLYOFFICE/feature/testShareRoomByLink
union tests GetLink and ShareRoomByLink
2022-08-01 12:59:19 +03:00
5c1fa45279 Merge branch 'develop' into feature/testShareRoomByLink 2022-08-01 12:54:26 +03:00
f2ae627ca0 fix api 2022-08-01 12:34:17 +03:00
b03f8bc1dc Merge branch 'develop' into feature/pool-context 2022-08-01 11:49:11 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
615448319a fix mapper 2022-07-29 18:39:57 +03:00
71f7adc848
Merge pull request #745 from ONLYOFFICE/feature/doceditor-build-modify
Modify build doceditor service
2022-07-29 17:54:02 +03:00
sk81.biz@gmail.com
5af7d8d83c Merge remote-tracking branch 'origin/bugfix/editor-production-bundle-fix' into feature/doceditor-build-modify 2022-07-29 16:27:45 +03:00
Artem Tarasov
a649228525 Web: Doceditor: added React.Suspense 2022-07-29 16:16:17 +03:00
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +03:00
sk81.biz@gmail.com
9a7a426680 Modify editor image build 2022-07-29 11:51:38 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
4c26d1301a
Merge pull request #743 from ONLYOFFICE/bugfix/doceditor-build-fix
Bugfix/doceditor build fix
2022-07-28 18:30:05 +03:00
Artem Tarasov
3ff0ae9d44 Merge branch 'develop' into bugfix/doceditor-build-fix 2022-07-28 17:40:54 +03:00
Artem Tarasov
5496cdbe05 Web: Doceditor/build: changed deploy path for editor 2022-07-28 17:39:25 +03:00
Artem Tarasov
df74259b50 Web: Doceditor: added config to define port 2022-07-28 17:11:38 +03:00
Artem Tarasov
9921925bdb Web: Doceditor: express is included in server build, added required dependencies 2022-07-28 15:40:46 +03:00
Sergey Kirichenko
a7ebccb5cb
Add doceditor docker service (#742)
* Add docker doceditor service

* fix

* Cosmetic modify

* Cosmetic modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-28 15:33:03 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
997e20898a EF: added support of dbcotextpool 2022-07-27 20:12:08 +03:00
0c1ff6ffd7 union tests GetLink and ShareRoomByLink 2022-07-27 18:22:51 +03:00
d21ad45c25
Merge pull request #741 from ONLYOFFICE/bugfix/rooms-webdav
bugfix/rooms-webdav
2022-07-27 17:48:39 +03:00
12e167ca84 Files: fix archive folder for WebDav 2022-07-27 17:34:10 +03:00
Sergey Kirichenko
2a1883977c
Add feature for migration db in docker (#740)
* Add migration runner build image

* Add path for migration.runner build

* Modifiex build path migration.runner

* Fix migration-runner.yml

* Modify reference format for dockerhub

* Fix

* Check build reference format

* Fix build

* Modify migration runner  build path

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-27 16:48:00 +03:00
6091fe7d2a Sso: fix 2022-07-26 18:14:53 +03:00
391822a8d3
Merge pull request #738 from ONLYOFFICE/bugfix/doceditor-fix
Bugfix/doceditor fix
2022-07-26 17:13:03 +03:00
6b50703881
Merge branch 'develop' into bugfix/doceditor-fix 2022-07-26 17:12:50 +03:00
33769036d5 fix 2022-07-26 14:53:36 +03:00
3d22992b7d Migrations: rename 2022-07-26 14:52:53 +03:00
e4df3b2371 fix 2022-07-26 13:39:16 +03:00
6e0aa3a6f9 fix 2022-07-26 13:21:21 +03:00
Artem Tarasov
2988838060 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-26 12:32:41 +03:00
Artem Tarasov
2529a7a123 Web: Doceditor: fixed convert file 2022-07-26 12:32:04 +03:00
Sergey Kirichenko
5dfc123374
Add docker services build (#739)
* Add docker services

* fix build, fix notify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-26 12:26:42 +03:00
0fe40c3669
Merge pull request #714 from ONLYOFFICE/feature/migrations-fix
Feature/migrations fix
2022-07-26 12:02:32 +03:00
dc4f066b05 Merge branch 'develop' into feature/migrations-fix 2022-07-26 11:37:48 +03:00
Artem Tarasov
294cdf4881 Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr) 2022-07-26 11:19:01 +03:00
Artem Tarasov
045c00b4ff Web: Common/Doceditor: fixed name of init state of editor 2022-07-26 10:56:25 +03:00
824232c01a fix 2022-07-25 19:31:37 +03:00
ab015538d9 fix 2022-07-25 19:20:16 +03:00
e8bcfce41a removed sql files
added runMigrations.bat
2022-07-25 19:03:37 +03:00
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
d50a932443 Web: Doceditor: removed PreparePortalDialog and added a call to docEditor.showMessage when the portal is being restored 2022-07-25 17:57:44 +03:00
Artem Tarasov
eb352fd860 Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json. 2022-07-25 17:54:51 +03:00