Commit Graph

8712 Commits

Author SHA1 Message Date
SuhorukovAnton
7b8efca8b3 x-www-form-urlencoded: fix 2020-11-06 12:46:57 +03:00
Artem Tarasov
63763ac499 Web: Files: StyledPanel: fixed font-size in ComboButton in AddUserPanel and AddGroupPanel 2020-11-06 12:46:21 +03:00
SuhorukovAnton
8b5a34d98f Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-06 12:05:30 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
Artem Tarasov
678d31cc32 Web: Common: GroupSelector: fixed placeholder 2020-11-05 23:59:44 +03:00
Artem Tarasov
13456f6dd0 Web: Files: applied icon MoveToIcon 2020-11-05 22:43:11 +03:00
Artem Tarasov
cff89239b5 Web: Components: Icons: added icon MoveToIcon, vhanged icon Copy 2020-11-05 22:40:48 +03:00
Artem Tarasov
e1ebfe1cbf Web: Files: VersionHistory: added external link in row 2020-11-05 21:10:21 +03:00
Artem Tarasov
eb220f0987 Web: Files: fixed dropdowns 2020-11-05 20:35:05 +03:00
Artem Tarasov
321d24af79 Web: Components: drop-down/drop-down-items: fixed height of separator and margin 2020-11-05 20:34:35 +03:00
Vladislav Makhov
265ed05414 Merge branch 'develop' into feature/third-party-settings 2020-11-05 19:19:50 +03:00
Vladislav Makhov
462c7578fb Moved declaration out from render 2020-11-05 18:56:45 +03:00
Vladislav Makhov
b777439f09 Change to decomposed prop consumer 2020-11-05 18:43:21 +03:00
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +03:00
Vladislav Makhov
79d2940514 Rename prop NewProps to newProps 2020-11-05 18:41:01 +03:00
Vladislav Makhov
9220ab7d4f Fix name 2020-11-05 18:38:31 +03:00
Vladislav Makhov
fc534aca67 Fix name 2020-11-05 18:38:00 +03:00
Vladislav Makhov
2108c2fba9 Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports 2020-11-05 18:20:15 +03:00
Vladislav Makhov
baa90d1a84 remove console warnings 2020-11-05 18:17:10 +03:00
Vladislav Makhov
c483acfde3 this.state decompose 2020-11-05 18:14:59 +03:00
abc89c0e11
Merge branch 'develop' into feature/filter-loader 2020-11-05 18:12:32 +03:00
Vladislav Makhov
49acf0168c Moved declarations out from render 2020-11-05 18:11:32 +03:00
e22de56363
Merge branch 'develop' into feature/third-party-settings 2020-11-05 17:45:54 +03:00
Artem Tarasov
30adb42aaa Web: Files: added new icons for folder 24x24 2020-11-05 17:22:45 +03:00
Artem Tarasov
c2ea1cc19e Web: Files: settings: fixed gap between toggle button 2020-11-05 16:58:29 +03:00
Artem Tarasov
1fce8d0c03 Web: Components: toggle-button: fixed size icon 2020-11-05 16:56:15 +03:00
Viktor Fomin
151dc898f5 Update yarn.lock files 2020-11-05 12:28:39 +03:00
Viktor Fomin
ed84e89b94 web: common: bump version 2020-11-05 12:24:33 +03:00
Viktor Fomin
71bf070324 Web: Client: fix loader 2020-11-05 12:24:15 +03:00
Viktor Fomin
63015ca2bd Web: Common: fix color 2020-11-05 12:23:50 +03:00
Artem Tarasov
38c7faec04 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-05 11:57:55 +03:00
Artem Tarasov
91019b19bd web: common: bump version 2020-11-05 11:50:08 +03:00
Artem Tarasov
29b6e1d213 web: components: bump version 2020-11-05 11:50:01 +03:00
Artem Tarasov
c44990418e Web: Components: fix bugs related to adding prop size="min" 2020-11-05 11:49:00 +03:00
Artem Tarasov
ace2111197 Web: People: applied prop size for Avatar Component 2020-11-05 11:40:19 +03:00
Artem Tarasov
b077f450b5 Web: Client: applied prop size for Avatar Component 2020-11-05 11:39:56 +03:00
Artem Tarasov
481abf40f8 Web: Common: applied prop size for Avatar Component 2020-11-05 11:39:09 +03:00
Artem Tarasov
c310545a83 Web: Components: applied props size="min" 2020-11-05 11:35:44 +03:00
Artem Tarasov
39d00f3dc4 Web: Components: Avatar: add props size='min' 2020-11-05 11:34:14 +03:00
Viktor Fomin
e2a32c10d6 Web: Common: added one row 2020-11-05 11:16:55 +03:00
Viktor Fomin
3bdff517f9 Web: People: rename headers components 2020-11-05 11:16:33 +03:00
Viktor Fomin
081fe180bb Web: Files: rename headers components 2020-11-05 11:15:46 +03:00
Viktor Fomin
e4f6dd255e Web: Common: rename headers components 2020-11-05 11:15:15 +03:00
Artem Tarasov
df9a1658e9 Web: People: refactoring 2020-11-05 09:44:20 +03:00
Artem Tarasov
6a4cabcedf Web: Components/Files/People: fix styles 2020-11-05 09:22:14 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
aea74a82e8 Mobile: fix 2020-11-04 14:15:14 +03:00
Viktor Fomin
1c2e8e5c67 Web: Common: create headline loader 2020-11-04 12:27:56 +03:00
Viktor Fomin
37fc3fff7c Web: Common: added x, y props 2020-11-04 12:24:52 +03:00
Viktor Fomin
72467a70c2 Web: People: fix header loader 2020-11-04 12:24:02 +03:00