Commit Graph

23029 Commits

Author SHA1 Message Date
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
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
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
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
17a15852a8 fix 2022-07-25 17:36:52 +03:00
b1ae889f75 fix 2022-07-25 17:29:46 +03:00
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00
9062431197 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 17:02:18 +03:00
cb066ea5eb
Merge pull request #737 from ONLYOFFICE/bugfix/article
Bugfix/article
2022-07-25 17:00:56 +03:00
1d12faaa60 AutoMigrationCreator separated in two projects 2022-07-25 16:57:16 +03:00
52f41fa8b1 Merge branch 'bugfix/article' of github.com:ONLYOFFICE/AppServer into bugfix/article 2022-07-25 16:47:54 +03:00
46a0d3f446 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article 2022-07-25 16:47:15 +03:00
0b706db9ff Web: Common: Article: add margin 2022-07-25 16:47:04 +03:00
16cee4e497 Update yarn.lock 2022-07-25 16:46:13 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
5e646b2992 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 16:20:47 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
ee5a326bc8 Web: Common: Article: fix scroll position 2022-07-25 15:53:04 +03:00
Artem Tarasov
9dcff71504 Web: Doceditor/Client: fixed share settings request (ssr) 2022-07-25 14:52:18 +03:00
141257d3fc Postgre: fix 2022-07-25 14:26:58 +03:00
c85541bfb7 fix 2022-07-25 14:18:08 +03:00
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
Artem Tarasov
57fb7ca7e1 Web: Doceditor: fixed api requests 2022-07-25 13:24:43 +03:00
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00