Commit Graph

4927 Commits

Author SHA1 Message Date
TatianaLopaeva
13a9e3e73b Changed styles and Added flexible length for tablet and mobile 2020-09-21 10:17:20 +03:00
TatianaLopaeva
2d684556b6 Refactoring 2020-09-18 18:15:12 +03:00
TatianaLopaeva
833b2c8860 Refactoring 2020-09-18 17:36:56 +03:00
TatianaLopaeva
0945cf05f3 Refactoring 2020-09-18 17:33:33 +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
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
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
TatianaLopaeva
fbb0787eff Added AcceptLicense 2020-09-17 17:07:32 +03:00
TatianaLopaeva
a858a3a846 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-17 11:25:51 +03:00
Vladislav Makhov
eb89987872 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 09:24:45 +03:00
Vladislav Makhov
26b1a18673 Web: Common: fix redirect after success authentication 2020-09-17 09:24:28 +03:00
Alexey Kostenko
7474fcf681 Web: common: bump version 2020-09-17 09:18:54 +03:00
Alexey Kostenko
d60bdedf9b Web: Common: Fix pin/unpin on IOS devices 2020-09-17 09:17:47 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
f2d3336436 web: components: bump version 2020-09-16 18:32:36 +03:00
e66ca03cbb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 18:08:41 +03:00
ecb2879a77 Web: Components: Styled AvatarEditor + applied changes 2020-09-16 18:08:32 +03:00
Vladislav Makhov
0a7bc4d75f Web: Components: fix z-index value 2020-09-16 12:34:22 +03:00
2209e34779 Api: settings. added accept license method 2020-09-16 12:11:37 +03:00
TatianaLopaeva
8ecc93a30c Changed logic of upload license 2020-09-16 10:33:06 +03:00
Vladislav Makhov
931a1d9365 Web: Common: Removed useless commas 2020-09-16 09:58:05 +03:00
e5525f4e08 Web: Components: Removed useless comma 2020-09-16 09:50:31 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
530a2df6a6 web: components: bump version 2020-09-15 23:23:20 +03:00
5607f00069 Web: Components: Update storybook packages 2020-09-15 23:23:10 +03:00
b9b94b1784 WebL Components: Fixed tests on AvatarEditor 2020-09-15 23:16:16 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
e855650551 web: components: bump version 2020-09-15 22:44:27 +03:00
e989bc0b75 web: components: bump version 2020-09-15 22:43:55 +03:00
d750335924 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-09-15 22:43:37 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
c4b686daa3 web: components: bump version 2020-09-15 22:33:53 +03:00
0f704b7f5e Web: Components: Replaced package react-avatar-editor to with local code 2020-09-15 22:33:19 +03:00
4d3bc676ce Web: Components: Styled AvatarEditor 2020-09-15 22:31:52 +03:00
a9ce44a563 Web: Components: Changed svg icons 2020-09-15 22:30:19 +03:00
7c5a7dcbb8 Web: Components: Added contentHeight/contentWidth to ModalDialog 2020-09-15 22:29:14 +03:00
57f2025cd9 Web: Components: Renamed isContainsFile to existImage 2020-09-15 22:27:58 +03:00
TatianaLopaeva
3eeb24a5b5 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-09-15 17:52:45 +03:00
TatianaLopaeva
96d0d94535 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 17:40:31 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
Vladislav Makhov
8da994f92c Web: Common: fix login error handling 2020-09-15 17:35:57 +03:00
TatianaLopaeva
d8abe20133 Refactoring 2020-09-15 17:23:57 +03:00
68d43001c3 web: common: bump version 2020-09-15 15:48:55 +03:00
4e34836e4e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-15 15:47:47 +03:00
3c0d0c0523 Web: Common: fixed filter styles 2020-09-15 15:10:12 +03:00
Artem Tarasov
fcf878dd6b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 15:06:00 +03:00