|
|
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 |
|
|
|
1cbe04f044
|
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
Feature/remove unused dep
|
2021-06-04 15:06:47 +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 |
|
|
|
a7edb118ac
|
Web: Files: added conversion for upload action
|
2021-06-03 12:50:01 +03:00 |
|
|
|
bcc9e6c34b
|
ResManager: additional feature
|
2021-06-03 12:48:25 +03:00 |
|
|
|
f21188b5cb
|
Web: Client: fixed wizard culture
|
2021-06-03 12:22:38 +03:00 |
|
|
|
ceb19659f3
|
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
Feature/thirdparty for two frameworks
|
2021-06-03 12:19:27 +03:00 |
|
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +03:00 |
|
|
|
43ff5210bf
|
Web: Client: access portal page refactoring
|
2021-06-02 20:30:54 +03:00 |
|
|
|
581df1cdcf
|
Web: Files: added update after converting the file
|
2021-06-02 18:41:15 +03:00 |
|
|
|
e75e048e49
|
crm: fixed build
|
2021-06-02 18:24:49 +03:00 |
|
|
|
cc073f46e3
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-02 17:04:12 +03:00 |
|
|
|
3635905167
|
Backup: fixed link
|
2021-06-02 17:02:19 +03:00 |
|
|
|
ce77c270de
|
Web: Files: added conversion progress for file
|
2021-06-02 16:56:27 +03:00 |
|
|
|
e05f2bfec5
|
Web: Settings: Manual Backup: Fixed styles.
|
2021-06-02 16:41:48 +03:00 |
|
|
|
d134398167
|
Storage: fix resolve
|
2021-06-02 16:28:05 +03:00 |
|
|
|
5e8751d9f1
|
Web: Files: added convert file icon, refactoring convert dialog
|
2021-06-02 16:03:46 +03:00 |
|
Artem Tarasov
|
d960ae6220
|
Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2021-06-02 15:09:03 +03:00 |
|
|
|
d741e91e96
|
Backup: fixed notify
|
2021-06-02 15:00:36 +03:00 |
|
|
|
c91b1090f9
|
Web: Settings: Manual/Auto Backup: Fixed required fields for aws storage.
|
2021-06-02 14:47:17 +03:00 |
|
|
|
4d44ccad12
|
Merge branch 'develop' into feature/restore-files-convertation
# Conflicts:
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-06-02 14:28:42 +03:00 |
|
|
|
cf3e315e92
|
Merge pull request #269 from ONLYOFFICE/feature/translations
Feature/translations
|
2021-06-02 14:24:10 +03:00 |
|
|
|
d8dc1d75ad
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-02 14:07:45 +03:00 |
|
|
|
0aa6a71ea8
|
Merge branch 'develop' into feature/translations
|
2021-06-02 14:05:43 +03:00 |
|
|
|
bd299a718b
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-06-02 13:55:19 +03:00 |
|
|
|
62ac315c8d
|
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
|
2021-06-02 13:55:11 +03:00 |
|
|
|
f9e53d038f
|
Web: People: fixed onDeletePersonalDataClick
|
2021-06-02 13:46:25 +03:00 |
|
|
|
28c5325137
|
Web: Settings: Manual/Auto Backup: Splitted third-party storage module for manual and auto modules.
|
2021-06-02 13:19:42 +03:00 |
|
|
|
36bc5a4172
|
Backup: fix
|
2021-06-02 12:58:46 +03:00 |
|
