Commit Graph

23350 Commits

Author SHA1 Message Date
f068d41b4f Configured frontend.code-workspace 2022-07-29 12:21:10 +03:00
sk81.biz@gmail.com
9a7a426680 Modify editor image build 2022-07-29 11:51:38 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
4c097607f9 Web: Fix position of MainButton with logo and display logo 2022-07-29 10:17:41 +03:00
27b7da5977 Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-07-29 09:24:25 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
211ac2666f Web: Fix error on user equals null 2022-07-28 19:11:48 +03:00
027b23ba92 Web: Added toast 2022-07-28 19:10:58 +03:00
98645969b6 Web: Moved some files from past locations 2022-07-28 19:10:36 +03:00
e16b3864ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-28 19:09:25 +03:00
9d4e107d6c Web: Client: SSO: fix store actions 2022-07-28 18:35:58 +03:00
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +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
a87497a385 Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings 2022-07-28 17:34:27 +03:00
Artem Tarasov
df74259b50 Web: Doceditor: added config to define port 2022-07-28 17:11:38 +03:00
256c2de843 Web: Removed modules dependencies and People and Files mobx providers 2022-07-28 16:11:55 +03:00
90cd7c1dbf Web: Added missed prop. 2022-07-28 15:54:08 +03:00
5651d3645e Web: Refactoring. 2022-07-28 15:50:09 +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
cbb60432e6 Web: Client: SSO: refactoring 2022-07-28 15:29:05 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
c4149beaab Web: Client: SSO: refactoring 2022-07-28 15:15:17 +03:00
ec9d2bf28a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-28 12:55:17 +03:00
e61d77b624 Web: Optimization of component. 2022-07-28 12:42:34 +03:00
53737a06e8 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
2022-07-28 10:38:29 +03:00
998366ab6f EventBus: fixed ProtobufSerializer 2022-07-27 20:24:18 +03:00
997e20898a EF: added support of dbcotextpool 2022-07-27 20:12:08 +03:00
ddcde5f7ed Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection . 2022-07-27 18:29:27 +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
2c4d415a35 fix restore 2022-07-27 17:07:02 +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
a8ee357ae8 fix 2022-07-27 15:39:53 +03:00
832b6c9511 Web: Client: SSO: fix fill fields 2022-07-27 13:31:36 +03:00
6cf2d685ce Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-07-27 11:11:44 +03:00
7ba0e002d2 Web: Client: SSO: fix upload metadata 2022-07-27 11:11:16 +03:00
0e0cc87aba Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2022-07-26 19:02:17 +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
8be8b072d1 Web: Restore: Returned restore. 2022-07-26 16:50:22 +03:00
8833c89a5a Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-07-26 15:53:56 +03:00
a7a70246fc Web: Backup: Added missed props. 2022-07-26 15:53:35 +03:00
321e44cb94 fix SetFilterByTypes 2022-07-26 14:55:19 +03:00
33769036d5 fix 2022-07-26 14:53:36 +03:00
3d22992b7d Migrations: rename 2022-07-26 14:52:53 +03:00