Commit Graph

23353 Commits

Author SHA1 Message Date
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
9a8caeb951 backup: update thirdparty 2022-07-26 13:50:37 +03:00
e4df3b2371 fix 2022-07-26 13:39:16 +03:00
6e0aa3a6f9 fix 2022-07-26 13:21:21 +03:00
c5baa8834d Web: Fix 'Accounts' imports, routes and includes 2022-07-26 12:51:52 +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
efce20d64f Merge branch 'develop' into feature/integration-system 2022-07-26 12:13:21 +03:00
81e7526c10 Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-07-26 12:04:25 +03:00
5dccd8f52c Web: Backup: Added direct third-party connection component. 2022-07-26 12:03:35 +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
0ebd28f299 Web: Merged 'People' module with 'Client' and fixed paths 2022-07-25 22:19:47 +03:00
280f702cf9 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	yarn.lock
2022-07-25 21:29:04 +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
09f3b29fe9 backup s3 2022-07-25 16:13:36 +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
c01edd78be Api: Capabilities fix 2022-07-25 12:57:03 +03:00
ea79763079 Web: Common: Article: fix style 2022-07-25 11:42:40 +03:00
Artem Tarasov
06450fe804 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 10:39:06 +03:00