Commit Graph

22973 Commits

Author SHA1 Message Date
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
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
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
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
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
2e5f2cb7a6 Web: Components: Themes: fix padding 2022-07-23 01:39:54 +03:00
a0f3e18b91 Web: Common: Article: fix style 2022-07-23 01:27:22 +03:00
79296c742f Web: Common: Article: fix header jump 2022-07-23 01:23:25 +03:00
6786fd40b0 Web: Common: Article: fix desktop width 2022-07-23 01:20:19 +03:00
3735ca16b3 Web: Common: Article: fix jumping 2022-07-23 00:53:40 +03:00
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
Vashchuk Nikita
d1f0d5403c modified AutoMigrationCreator 2022-07-22 22:34:12 +03:00