Commit Graph

7314 Commits

Author SHA1 Message Date
Alexey Kostenko
5550a8d321 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 16:49:32 +03:00
Artem Tarasov
2e8a170166 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 16:10:09 +03:00
Artem Tarasov
ba03e55ffc added display of changes in group composition after adding/removing members 2020-09-17 16:05:56 +03:00
Artem Tarasov
fcaf136b2c added document title change after group update and deletion 2020-09-17 16:04:23 +03:00
Alexey Kostenko
3b1805f1f9 Web: Common: Unpin sidebar if not enough screen width 2020-09-17 15:52:07 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
Alexey Kostenko
dfd94a854f Web: Components/Common: Added new width constant for pin/unpin, style fix 2020-09-17 13:22:47 +03:00
f176d99f16 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 12:07:44 +03:00
9623029d82 Web: Files: Speeded up loading first page + refactoring 2020-09-17 12:07:36 +03:00
2f4a3141d5 Web: People: Speeded up loading first page + refactoring 2020-09-17 11:28:23 +03:00
c16659c322 Web: Client: Removed useless markup 2020-09-17 10:21:15 +03:00
fdf4e7564b Web: Client: Speeded up loading first page + refactoring 2020-09-17 10:18:44 +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
ba7c4db354 WebL People: Remove temp prop 2020-09-16 18:35:49 +03:00
f2d3336436 web: components: bump version 2020-09-16 18:32:36 +03:00
374e4ece1a WebL People: Remove temp prop 2020-09-16 18:32:14 +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
SuhorukovAnton
7fae3bf83a encryption: upload crypt 2020-09-16 17:03:33 +03:00
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +03:00
Artem Tarasov
1f4705c81b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 16:13:18 +03:00
Artem Tarasov
0fb03ea54a Web: People: fixed double redirect after edit/create group 2020-09-16 16:13:03 +03:00
94a5079503 Encryption: notify fix 2020-09-16 13:50:53 +03:00
Vladislav Makhov
0a7bc4d75f Web: Components: fix z-index value 2020-09-16 12:34:22 +03:00
SuhorukovAnton
bb7c283145 enctyption: remove bug 2020-09-16 11:10:16 +03:00
SuhorukovAnton
8e0ebceb36 encryption: copyright 2020-09-16 10:54:52 +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
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +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