Commit Graph

13073 Commits

Author SHA1 Message Date
83d4bfd7a3 Web: Files: added conversion for uploaded files 2021-06-08 14:24:47 +03:00
27e6226e66 Web: People: get backupCodes from tfa store 2021-06-08 14:19:55 +03:00
41ef020616 Web: Common: added backupCodes in tfa store 2021-06-08 14:19:36 +03:00
Artem Tarasov
67feed3cf9 Web: People: fix crash Profile 2021-06-08 14:01:19 +03:00
71564c7348 Web: People: deleted duplicate key 2021-06-08 13:35:31 +03:00
ffbbcc6ac2 Web: People: change trans on t 2021-06-08 13:34:41 +03:00
af6d7cd160 Web: People: fixed 2021-06-08 13:26:04 +03:00
Artem Tarasov
46a76abef3 Web: People: added withLoader to ProfileAction 2021-06-08 13:25:43 +03:00
9c5a960d40 Web: Client: submit by numpad enter 2021-06-08 13:09:46 +03:00
Artem Tarasov
b32edbc3f5 Web: People: added wtihLoader to GroupAction header 2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9 Web: People: added withLoader to GroupAction 2021-06-08 13:01:16 +03:00
ffb5dace5d Web: People: fixed 2021-06-08 12:28:51 +03:00
Artem Tarasov
5dc279b5a9 Web: People: added withLoader to Profile 2021-06-08 12:28:19 +03:00
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
655f250cdb Web: Client: fixed accessPortal page 2021-06-08 12:08:25 +03:00
58f7a0f285 Tfa: fix 2021-06-08 11:34:14 +03:00
Artem Tarasov
81b6ea3d02 Web: People: refactoring withLoader, applied for Home 2021-06-08 02:49:34 +03:00
Artem Tarasov
a317b02e2e Web: People: added and applied LoadingStore 2021-06-08 01:22:28 +03:00
31423ddbc6 Web: Files: fixed upload panel visibility 2021-06-07 18:05:02 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
4d9c26545e Web: Files: added conversion progress 2021-06-07 16:20:18 +03:00
50f0bef484 remove unnecessary using 2021-06-07 13:56:24 +03:00
fd485e06e4 remove_binary_formatter 2021-06-07 13:54:17 +03:00
2d56421dd2 Web: Files: fixed mobx warnings 2021-06-07 13:52:01 +03:00
9a6f281a50 Web: Files: fixed conversion of files, added conversion loaders 2021-06-07 12:44:59 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth 2021-06-07 11:54:06 +03:00
Artem Tarasov
b3bccbb98d Web: People: added usage setFirsLoad 2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0 Web: People: added HOC withLoader 2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51 Merge branch 'develop' into bugfix/fixed-styles 2021-06-07 00:24:19 +03:00
Artem Tarasov
fac8dafe1e Web: Files: fixed width of unselected node in settings tree 2021-06-07 00:21:40 +03:00
Artem Tarasov
9a798506e0 Web: deleted unnecessary code 2021-06-06 23:43:20 +03:00
Artem Tarasov
acd4a3893c Web: added rule to webpack.config for woff, woff2 2021-06-06 23:39:52 +03:00
Artem Tarasov
7db667108b Web: added font-family Opne-Sans to /public, added import fonts to custom.scss 2021-06-06 23:35:56 +03:00
fc20a742a1 crm: refactoring 2021-06-04 19:27:44 +03:00
58e7e41cdd crm: code cleanup 2021-06-04 17:38:42 +03:00
Artem Tarasov
645030cd25 Merge branch 'develop' into feature/thumbnails 2021-06-04 16:40:24 +03:00
1cbe04f044
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
Feature/remove unused dep
2021-06-04 15:06:47 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
Vladislav Makhov
da8503612e web: files: private room: fix upload dialog 2021-06-04 11:23:00 +03:00
Artem Tarasov
fd88de8064 Merge branch 'develop' into bugfix/fixed-styles 2021-06-04 10:35:37 +03:00
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth 2021-06-03 20:27:57 +03:00
a682cdd3f7 Web: Client: fixed settings tree 2021-06-03 20:25:54 +03:00
ce35405190 Web: Client: deleted duplicate key 2021-06-03 20:25:35 +03:00
209f3b174c Web: Files: added tReady to ConvertDialog 2021-06-03 17:29:06 +03:00
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
ba41a5aecb Merge branch 'develop' into feature/restore-files-convertation 2021-06-03 15:59:24 +03:00
531233a9a8 Web: Files: added new translations, fixed conversion 2021-06-03 15:56:14 +03:00
c04dc44e36 crm: refacroting 2021-06-03 15:51:29 +03:00
62b57fa313 Web: Files: refactoring UploadDataStore 2021-06-03 14:23:25 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00