Commit Graph

6632 Commits

Author SHA1 Message Date
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
Alexey
73d1cf269b Web: Common: Added keyboard events to MediaViewer 2020-08-12 16:11:30 +03:00
Artem Tarasov
171ae1b147 web: common: bump version 2020-08-12 14:57:41 +03:00
Artem Tarasov
00fcc549e5 web: components: bump version 2020-08-12 14:57:24 +03:00
Artem Tarasov
2bd6c8eb10 Merge branch 'master' into feature/Wizard 2020-08-12 14:56:22 +03:00
9cb2fcdaac Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-12 14:39:16 +03:00
c0f82fdf71 Web: Files: added Unblock/Check-in 2020-08-12 14:39:04 +03:00
Artem Tarasov
f110b2a49a deleted Toast, added ModalDialog 2020-08-12 14:18:40 +03:00
Artem Tarasov
e3119d4610 fixed fontWeight link for License 2020-08-12 13:30:24 +03:00
Artem Tarasov
034d60707d fixed link 2020-08-12 13:08:24 +03:00
Artem Tarasov
a19d7ec4cf fixed modal dialog 2020-08-12 12:00:47 +03:00
Alexey
a8c0973d42 Merge branch 'feature/files' into feature/customization 2020-08-12 11:57:32 +03:00
Artem Tarasov
1503bc105b fix link 2020-08-12 11:54:08 +03:00
Alexey
b3ebf23c7b Web: Client: revert customization refactoring 2020-08-12 11:52:46 +03:00
57cd398457 web: common: bump version 2020-08-12 11:08:42 +03:00
181c1e52f4 Web: Files: added version history api 2020-08-12 11:08:04 +03:00
15745729c8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-12 10:14:46 +03:00
f3749c1c94 Web: Files: fixed version styles 2020-08-12 10:14:40 +03:00
Alexey
63fbf522c9 web: components: bump version 2020-08-12 09:04:08 +03:00
Alexey
f252c91966 Web: Components: Moved avatar rotation button 2020-08-12 09:03:56 +03:00
d529fcd69c web: common: bump version 2020-08-11 17:49:46 +03:00
408de4246f Web: Common: fixed files selection 2020-08-11 17:49:20 +03:00
5c67e42a74 web: common: bump version 2020-08-11 17:36:59 +03:00
5f32a94db0 Web: Common: fixed file selection 2020-08-11 17:36:22 +03:00
Ilya Oleshko
7e8fb518ce web: common: bump version 2020-08-11 16:00:25 +03:00
Ilya Oleshko
abc2bcc03c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-11 15:57:35 +03:00
Ilya Oleshko
fdbdf6a8b6 Web: Common: PageLayout: Fixed selection on draging 2020-08-11 15:53:39 +03:00
Ilya Oleshko
7ac9ad6c62 Web: People: Reassign: Fixed page wrapper 2020-08-11 15:51:27 +03:00
Ilya Oleshko
6df4e05bd9 Web: People: ProfileAction: Fixed page wrapper 2020-08-11 15:50:15 +03:00
Ilya Oleshko
bbc57115a3 Web: People: Profile: Fixed page wrapper 2020-08-11 15:49:54 +03:00
Ilya Oleshko
ade0c7d149 Web: People: Import: Fixed page wrapper 2020-08-11 15:49:40 +03:00
Ilya Oleshko
94f447a272 Web: People: Home: Fixed page wrapper 2020-08-11 15:49:22 +03:00