Commit Graph

6838 Commits

Author SHA1 Message Date
b15ad23ab9 Web: Files: fixed styles 2020-08-14 17:07:30 +03:00
129160c35e Web: Common: fixed filter styles 2020-08-14 17:06:08 +03:00
487ea08bb5 Web: Components: fixed badge styles, added isFill prop to context-menu-button 2020-08-14 17:05:47 +03:00
5e5c50a5f8
Merge pull request #69 from ONLYOFFICE/feature/thirdparty
Feature/thirdparty
2020-08-14 17:04:00 +03:00
maksim
c7a3fa85f2 Thirdparty: remove reference 2020-08-14 16:16:48 +03:00
maksim
c24bdfbbba Merge branch 'master' into feature/thirdparty 2020-08-14 16:01:55 +03:00
maksim
a1cb820d19 Thirdparty: remove files nuget exe 2020-08-14 15:53:33 +03:00
SuhorukovAnton
d6eb85c4bc socket: delete waste 2020-08-14 14:09:45 +03:00
SuhorukovAnton
4db1cd0af8 Merge branch 'master' into feature/socket.io 2020-08-14 14:01:27 +03:00
SuhorukovAnton
645b07b511 socket: bagfix 2020-08-14 13:56:15 +03:00
maksim
4a29a69761 feature custom nuget server 2020-08-14 13:48:34 +03:00
34696bfc37 web: common: bump version 2020-08-14 13:02:56 +03:00
7bd1e7abe1 Web: Files: added version api 2020-08-14 13:02:23 +03:00
6d92275269 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-08-14 11:42:13 +03:00
58fffc1756 File: fix revision 2020-08-14 11:35:34 +03:00
Alexey
7199e3f7ba web: components: bump version 2020-08-14 09:35:13 +03:00
Alexey
9084bbb692 Web: Components: Added keyboard handling to SaveCancelButtons component 2020-08-14 09:35:07 +03:00
Alexey
8987b29192 Web: Components: Style fix 2020-08-14 09:21:35 +03:00
Alexey
a9627fd9ef Web: Components: Added test and storybook to SaveCancelButtons component 2020-08-14 09:05:07 +03:00
Alexey
a0e989d82b web: components: bump version 2020-08-14 08:29:23 +03:00
Alexey
fada82ae41 Web: Components: Fix rotate in avatar editor 2020-08-14 08:29:15 +03:00
59b5c5f951
Merge pull request #64 from ONLYOFFICE/feature/customization
Feature/customization
2020-08-13 18:42:59 +03:00
9299193f6c Web: Files: fixed embedding link, fixed share link 2020-08-13 15:56:24 +03:00
18e3ff6bc6 web: common: bump version 2020-08-13 14:42:57 +03:00
0626d82fa8 Web: Files: added unblock/check-in api 2020-08-13 14:42:29 +03:00
Alexey
58e73a9ffb Web: Client: Settings: Refactoring 2020-08-13 14:21:59 +03:00
2616e8a8dd Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 12:02:07 +03:00
37df28d1a9 Web: Files: fixed badge error 2020-08-13 12:02:00 +03:00
Alexey
cc0c852ae1 Web: Client: Settings: code formatting 2020-08-13 12:01:45 +03:00
62c5bd5244 Merge branch 'master' into feature/files 2020-08-13 11:53:47 +03:00
cbf9630d7f File: added Locked, LockedBy 2020-08-13 11:52:59 +03:00
Alexey
6d1a78922d Web: Client: Settings: Refactoring 2020-08-13 11:11:03 +03:00
4891311488 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-13 10:15:11 +03:00
5795c6f324 Merge branch 'feature/files' into feature/customization
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Components/src/index.js
2020-08-13 10:07:14 +03:00
3c32cf3f9f web: components: bump version 2020-08-13 09:59:44 +03:00
b60dad90b8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-13 09:59:13 +03:00
ef15a36cf8 Web: Files: added icons to context menu actions 2020-08-13 09:59:05 +03:00
f0d2d42e97 Web: Components: added new icons 2020-08-13 09:57:21 +03:00
d6ff0d6a44 Merge branch 'master' into feature/files 2020-08-12 18:26:28 +03:00
Ilya Oleshko
6f7ff8cee9 web: components: bump version 2020-08-12 18:23:46 +03:00
Ilya Oleshko
b005ae7c50 Web: Components: Fix missing import 2020-08-12 18:22:22 +03:00
6782269c7f Files: lock file 2020-08-12 18:13:52 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
3a37e0839a Files: fix FileShareLink 2020-08-12 17:34:54 +03:00
acf5cff2f9
Merge pull request #67 from ONLYOFFICE/feature/Wizard
Feature/wizard
2020-08-12 17:33:18 +03:00
Artem Tarasov
1bd341fc33 fix translate 2020-08-12 17:17:14 +03:00
Artem Tarasov
c6d1198ae0 deleted console.log, simple condition 2020-08-12 16:38:34 +03:00
Artem Tarasov
4499d82de9 decomposition 2020-08-12 16:32:42 +03:00
Artem Tarasov
c301178a16 fixed translate 2020-08-12 16:32:17 +03:00
Alexey
512de9658e web: common: bump version 2020-08-12 16:11:37 +03:00