Commit Graph

7536 Commits

Author SHA1 Message Date
Alexey Kostenko
cd7d714476 Web: People: Fix loader style 2020-09-21 12:17:56 +03:00
Alexey Kostenko
4e1415774d Web: Client: Opening the file immediately after creation 2020-09-21 11:06:53 +03:00
TatianaLopaeva
13a9e3e73b Changed styles and Added flexible length for tablet and mobile 2020-09-21 10:17:20 +03:00
642472ce22 TenantExtra: fix 2020-09-20 20:27:51 +03:00
0000129b3b Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	common/ASC.Core.Common/Context/WorkContext.cs
#	common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/Crypt.cs
#	common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
#	common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
#	common/ASC.Data.Storage/Encryption/ICrypt.cs
#	common/ASC.Data.Storage/Encryption/IEncryptionService.cs
#	common/ASC.Data.Storage/Encryption/IMetadata.cs
#	common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
#	common/ASC.Data.Storage/Encryption/Metadata.cs
#	common/ASC.Data.Storage/Encryption/StreamWrapper.cs
#	config/storage.json
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
Artem Tarasov
916eb0439c web: common: bump version 2020-09-19 23:28:37 +03:00
Artem Tarasov
5f3a4c83e8 Web: People: fixed replacement of group members when adding 2020-09-19 23:26:11 +03:00
Artem Tarasov
405eabd720 Web: Components: fixed passing props selectedOprions in PeopleSelector 2020-09-19 23:24:18 +03:00
Artem Tarasov
16ff0e6386 Web: Files: fixed onExpand SettingsTree 2020-09-19 21:55:03 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
548b6c428d web: common: bump version 2020-09-19 18:27:08 +03:00
0f00799480 Web: Client: Fixed redirect to defaultPage 2020-09-19 18:24:48 +03:00
14ae702f36
Merge pull request #80 from ONLYOFFICE/feature/ASC.Data.Storage.Encryption
Feature/asc.data.storage.encryption
2020-09-18 21:30:54 +03:00
50ff5a94a4 Encryption: fix port 2020-09-18 21:15:50 +03:00
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
TatianaLopaeva
2d684556b6 Refactoring 2020-09-18 18:15:12 +03:00
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
TatianaLopaeva
833b2c8860 Refactoring 2020-09-18 17:36:56 +03:00
TatianaLopaeva
0945cf05f3 Refactoring 2020-09-18 17:33:33 +03:00
eb3336ad6a web: common: bump version 2020-09-18 17:07:17 +03:00
dbad9de295 Web: Common: fixed progress styles 2020-09-18 17:06:58 +03:00
4a09b4b5f2 Web: fixed body scroll 2020-09-18 17:06:35 +03:00
5b070d3509 web: common: bump version 2020-09-18 15:57:36 +03:00
52753d7bc3 web: components: bump version 2020-09-18 15:57:24 +03:00
809d167e29 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-18 15:54:55 +03:00
17ffb8999d Web: Common: fixed progress styles 2020-09-18 15:45:21 +03:00
44d63d3642 Web: Components: fixed Dnd styles 2020-09-18 15:43:08 +03:00
TatianaLopaeva
81583aca4f Changed logic for standaloneMod and refactoring header-container 2020-09-18 14:46:54 +03:00
TatianaLopaeva
564b250438 Changed margin of header-container 2020-09-18 13:23:35 +03:00
SuhorukovAnton
8cbc380241 encryption: fix 2020-09-18 13:06:32 +03:00
SuhorukovAnton
cb365ba75f encryption: add api-metods getProgress and getSettings 2020-09-18 13:02:20 +03:00
TatianaLopaeva
f4e876ccb5 Refactoring styles of advantages-container, button-container, contact-container 2020-09-18 12:25:49 +03:00
TatianaLopaeva
fa89566f8f Added headline 2020-09-18 12:24:14 +03:00
TatianaLopaeva
57d8da2600 Changed translation (ru) 2020-09-18 12:22:57 +03:00
Artem Tarasov
a04ca81999 web: common: bump version 2020-09-18 11:19:53 +03:00
Artem Tarasov
c43a476236 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-18 11:19:35 +03:00
Artem Tarasov
939a29442f Web: People: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:19:16 +03:00
Artem Tarasov
f3b8e4880c Web: Files: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:18:48 +03:00
Artem Tarasov
e369f6a9e0 Web: Common: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:17:40 +03:00
Artem Tarasov
3492be5ca4 Web: Common: added function changeTitleDocument to utils 2020-09-18 11:12:09 +03:00
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
Alexey Kostenko
04bf97ff08 Web: Components: Bump version 2020-09-18 10:45:02 +03:00
Alexey Kostenko
ab2a7b7fdb Web: Components: Fix DropDown in mainMutton 2020-09-18 10:44:30 +03:00
TatianaLopaeva
332b267157 Refactoring header-container 2020-09-18 10:24:48 +03:00
TatianaLopaeva
b1b07fc5de Changed logic of getSettingsPayment 2020-09-18 10:22:35 +03:00
Alexey Kostenko
67137aae94 Web: Components: Bump version 2020-09-18 10:13:38 +03:00
Alexey Kostenko
c88bca4a4b Web: Components: Fix ContextMenu background in Firefox 2020-09-18 10:13:06 +03:00
TatianaLopaeva
fbb0787eff Added AcceptLicense 2020-09-17 17:07:32 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
Alexey Kostenko
24a92d7e67 Web: Common/Components: Bump version 2020-09-17 16:50:37 +03:00