Commit Graph

25210 Commits

Author SHA1 Message Date
294e1199b2
Merge pull request #830 from ONLYOFFICE/bugfix/fixed-navigation-path
Bugfix/fixed navigation path
2022-09-16 14:48:30 +03:00
930e4f7ad3
Merge branch 'develop' into bugfix/fixed-navigation-path 2022-09-16 14:47:25 +03:00
e59984bc5c Web: Disabled integration settings. 2022-09-16 14:46:48 +03:00
f6f5c0a338 Web: Files: fixed back to parent folder from thirdparty folder 2022-09-16 14:42:30 +03:00
5d748a1788 Web: Files: fixed navigationPath for Shared folder 2022-09-16 14:41:23 +03:00
50e45e7289 Web: Editor: Fix SaveAs dialog 2022-09-16 14:38:44 +03:00
abe0f8563f Files: refactor 2022-09-16 14:01:50 +03:00
22d5c0c427 Files: refactor 2022-09-16 13:52:54 +03:00
5296bb8394 Merge branch 'develop' into feature/files-filter 2022-09-16 13:34:49 +03:00
d91848cfff Files: added withoutMe for files filter 2022-09-16 13:32:00 +03:00
0b5addd442 Web: Disabled customization settings, refactoring. 2022-09-16 12:42:53 +03:00
7deca97d7c
Merge pull request #827 from ONLYOFFICE/bugfix/sort-menu
Web:Cliet:Home: fix displaying 'Created' option to sort menu
2022-09-16 11:27:32 +03:00
TimofeyBoyko
315f232294 Web:Cliet:Home: fix displaying 'Created' option to sort menu 2022-09-16 11:24:39 +03:00
ee4a47454f Web: Disabled branding settings. 2022-09-16 10:45:10 +03:00
eb50124f48 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-16 09:33:15 +03:00
cd16261353 Web: fixed after merge. 2022-09-16 09:32:24 +03:00
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
c91711dbeb hosting: fixed running ActivePassive instance 2022-09-15 23:56:55 +03:00
c14bd6810d
Merge pull request #824 from ONLYOFFICE/bugfix/fixed-infinite-tiles-styles
Bugfix/fixed infinite tiles styles
2022-09-15 21:03:13 +03:00
d0a01ff723
Merge branch 'develop' into bugfix/fixed-infinite-tiles-styles 2022-09-15 20:54:58 +03:00
8b9e7792e4
Merge pull request #823 from ONLYOFFICE/feature/redesign-personal-filter
Feature/redesign personal filter
2022-09-15 20:54:27 +03:00
6438bca15d Web: Files: Fix translation 2022-09-15 20:47:04 +03:00
30618e3e22 Web: Files: Fix translation 2022-09-15 20:43:35 +03:00
6b728a0fca refactoring 2022-09-15 18:58:05 +03:00
TimofeyBoyko
a3d2bc47f7 Web:Client:Home: delete useless 2022-09-15 18:24:38 +03:00
TimofeyBoyko
2d1e18b337 Web:Client:Accounts: add clearAll 2022-09-15 18:21:04 +03:00
TimofeyBoyko
ca485bc41d Web:Client:Home: fix clearAll 2022-09-15 18:18:36 +03:00
ab5de603c1 nlog: fixed config 2022-09-15 18:17:23 +03:00
TimofeyBoyko
25188c57b8 Web:Client:Home: fix clear search 2022-09-15 18:06:00 +03:00
TimofeyBoyko
98ce868db0 Web:Client:Home: fix type of oform and docxf at info-panel 2022-09-15 17:48:15 +03:00
c3b9ca3127 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-15 17:47:07 +03:00
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
a252a07fd3 Web: fixed after merge. 2022-09-15 17:43:02 +03:00
TimofeyBoyko
b557ad5127 Web:Client:Home: refactoring type cell at table view 2022-09-15 17:35:41 +03:00
d21c910842 Web: Components: InfiniteLoader: removed useless selectedFolderId prop 2022-09-15 17:31:19 +03:00
TimofeyBoyko
afaa0db5c1 Web:Client:Home: fix type for OFORM and DOCXF at table view 2022-09-15 17:29:48 +03:00
TimofeyBoyko
b9e52bff6c Merge branch 'feature/redesign-personal-filter' of github.com:ONLYOFFICE/DocSpace into feature/redesign-personal-filter 2022-09-15 17:25:56 +03:00
TimofeyBoyko
24ea0edf19 Web:Client:Home: add catch error if available sort is undefiened at filter 2022-09-15 17:24:33 +03:00
9af39bd7c9 Web: Files: fixed infinite loading 2022-09-15 17:16:19 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
74fa95d843 Web: Components: fixed styles of infinite tiles 2022-09-15 17:14:34 +03:00
9360c19f3e
Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 16:54:10 +03:00
b4a8e496eb Web: Fixed bugs. 2022-09-15 16:34:14 +03:00
eeed96cb32 Web: Fixed bugs. 2022-09-15 15:58:21 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
2a943661c7
Merge pull request #796 from ONLYOFFICE/feature/backup_remove_waste_modules
Feature/backup remove waste modules
2022-09-15 14:50:12 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
12780606c2 Merge branch 'develop' into feature/backup_remove_waste_modules 2022-09-15 14:27:24 +03:00