Commit Graph

22270 Commits

Author SHA1 Message Date
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
Artem Tarasov
a77f413e9a Web: Doceditor: modified webpack config 2022-07-11 17:33:22 +03:00
Artem Tarasov
68b375faf3 Web: Doceditor: updated webpack version, updated yarn.lock 2022-07-11 17:32:22 +03:00
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal
Feature/create from modal
2022-07-11 17:28:09 +03:00
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
2022-07-11 10:47:33 +03:00
Artem Tarasov
05cf3b7d18 Web: Doceditor: fixed deletion of initial state 2022-07-10 13:01:18 +03:00
Artem Tarasov
a9c9649197 Web: Doceditor: refactoring server, deleted unnecessary code 2022-07-10 12:57:07 +03:00
Artem Tarasov
a1d599ee43 Web: Doceditor: modified webpack dev config 2022-07-10 12:53:58 +03:00
Artem Tarasov
2a74e0e8cd Web: Doceditor: deleted unnecessary files 2022-07-10 12:47:15 +03:00
Artem Tarasov
120f5f7b17 Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0 2022-07-10 12:34:16 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00
f69194b034 Web: Client: TfaActivation: fix error 2022-07-08 16:22:30 +03:00
6a690fc175 Web: Client: fix confirmLinkData 2022-07-08 16:22:08 +03:00
63c2c34d44 refactoring tests 2022-07-08 15:31:07 +03:00
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files
Files: update docstore submodule
2022-07-08 15:11:18 +03:00
0504838691 fix tests 2022-07-08 11:46:34 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +03:00
b8a2cf5292 Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-07-07 18:11:42 +03:00
5e08271fb0 Merge branch 'release/v1.2' into develop 2022-07-07 18:03:39 +03:00
dab94135cf Web: Components: fixed onClickOutside eventTypes 2022-07-07 17:58:41 +03:00
c8458858e0 Merge branch 'develop' into feature/room_tests 2022-07-07 17:56:40 +03:00
f8c27acc7d Merge branch 'develop' into feature/room_tests 2022-07-07 17:56:15 +03:00
912bb3ed36
Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
2022-07-07 17:55:40 +03:00
2bc07e0a1d Files: added DeleteAfter for archiving/unarchiving rooms 2022-07-07 17:52:20 +03:00
b5d082d816 room tests:first version 2022-07-07 17:45:23 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
c3b505f08e fix Bug 58035 2022-07-07 16:34:47 +03:00
df3a74dffe
Merge pull request #710 from ONLYOFFICE/feature/rooms-delete-after
feature/rooms-delete-after
2022-07-07 16:25:38 +03:00
f52162827e Files: added DeleteAfter for rooms 2022-07-07 16:20:44 +03:00
085f769a19 Bump version to v1.2.0 in package.json 2022-07-07 15:30:06 +03:00
f28a372418 Fix Bug 58040: active download button 2022-07-07 14:52:26 +03:00
75251220ba Web: Files: ThirdPartyDialog: fix condition 2022-07-07 13:45:26 +03:00
a171129d5f Fix Bug 58041: add cloud button not work 2022-07-07 13:36:19 +03:00
fb30766210 Fix Bug 58038: hide upload button by cross button 2022-07-07 13:16:46 +03:00
a04ae63a82 MemberModel: CultureName 2022-07-07 12:05:31 +03:00