Commit Graph

9862 Commits

Author SHA1 Message Date
2e85702127 Settings: version. CommunityServer replaced with DocSpace 2022-08-19 16:34:39 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
2e06c8fd58 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
#	build/install/win/DocSpace.aip
2022-08-10 09:57:03 +03:00
83e7ad25d2 SSO: fixed successful login 2022-08-09 17:14:35 +03:00
bfe43ebe96 SSO: fix login 2022-08-09 16:53:22 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +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
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
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
98645969b6 Web: Moved some files from past locations 2022-07-28 19:10:36 +03:00
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +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
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +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
6091fe7d2a Sso: fix 2022-07-26 18:14:53 +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
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
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
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
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00
46a0d3f446 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article 2022-07-25 16:47:15 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
Artem Tarasov
9dcff71504 Web: Doceditor/Client: fixed share settings request (ssr) 2022-07-25 14:52:18 +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
Artem Tarasov
06450fe804 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 10:39:06 +03:00
Artem Tarasov
5656eb6072 Web: Doceditor: optimized dialog rendering 2022-07-25 10:37:57 +03:00
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
ea74b77dcd Web: Client: move toast to shell 2022-07-24 00:50:19 +03:00
86337271e4 Web: Client: IndicatorLoader: fix position 2022-07-23 22:07:50 +03:00
8152557397 Web: Client: Settings: fix article loader 2022-07-23 22:07:25 +03:00
bcf6faf40d Web: Client: add dialogs wrapper, fix rerender 2022-07-23 02:15:16 +03:00
7cf51de990 Web: Client: ProfileActionsStore: fix open about 2022-07-23 02:07:37 +03:00