|
|
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 |
|
|
|
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 |
|
Artem Tarasov
|
5656eb6072
|
Web: Doceditor: optimized dialog rendering
|
2022-07-25 10:37:57 +03:00 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
|
|
f2d0448670
|
Web: Client: Settings: fix header loader
|
2022-07-24 21:14:35 +03:00 |
|
|
|
473dcb4f74
|
Web: Client: Settings: add sso loader
|
2022-07-24 21:12:50 +03:00 |
|
|
|
7684fe7632
|
Web: Added 'Accounts' routing
|
2022-07-24 20:38:41 +03:00 |
|
|
|
c83811576c
|
Web: Fix files-settings routing
|
2022-07-24 20:17:45 +03:00 |
|
|
|
7db4dcd407
|
Web: Client: Added missing code
|
2022-07-24 20:03:48 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
|
|
d92fb505b9
|
Web: Client: Settings: SSO: fix modal
|
2022-07-24 00:58:15 +03:00 |
|
|
|
ea74b77dcd
|
Web: Client: move toast to shell
|
2022-07-24 00:50:19 +03:00 |
|
|
|
334d1d3969
|
Web: Client: move toast to shell
|
2022-07-24 00:45:33 +03:00 |
|
|
|
15c9b29d28
|
Web: Client: SSO: fix toast import
|
2022-07-24 00:44:05 +03:00 |
|
|
|
60469f901e
|
Web: Client: Settings: SSO: fix disable save button
|
2022-07-24 00:31:29 +03:00 |
|
|
|
934dc28abe
|
Web: Client: Settings: SSO: fix context scroll
|
2022-07-24 00:17:23 +03:00 |
|
|
|
a5ecd54dff
|
Web: Client: Settings: SSO: fix generate cert
|
2022-07-24 00:16:35 +03:00 |
|
|
|
ce7e554927
|
Web: Client: Settings: SSO: fix metadata urls
|
2022-07-24 00:16:03 +03:00 |
|
|
|
da942bde48
|
Web: Client: Settings: SSO: fix table style
|
2022-07-24 00:15:40 +03:00 |
|
|
|
86337271e4
|
Web: Client: IndicatorLoader: fix position
|
2022-07-23 22:07:50 +03:00 |
|
