|
167ca1fbb5
|
Web: Client: fixed loading
|
2021-06-09 00:39:08 +03:00 |
|
|
9019b36951
|
Web: Client: moved pages in sub-components
|
2021-06-09 00:33:04 +03:00 |
|
|
db21597f17
|
Web: Client: fixed access portal urls
|
2021-06-09 00:30:19 +03:00 |
|
|
3db9fde5aa
|
Web: Client: fixed title
|
2021-06-09 00:25:45 +03:00 |
|
|
b7ce4a35e7
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
|
2021-06-09 00:23:12 +03:00 |
|
|
d5989124f3
|
Web: Files: fixed conversion progress
|
2021-06-08 19:09:00 +03:00 |
|
Artem Tarasov
|
3db9b30e5e
|
Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-08 17:58:29 +03:00 |
|
|
f72e40357b
|
Merge pull request #261 from ONLYOFFICE/feature/two-factor-auth
Feature/two factor auth
|
2021-06-08 17:46:04 +03:00 |
|
|
93ba9c5940
|
Web: People: change trans on t
|
2021-06-08 16:09:51 +03:00 |
|
|
783bedffbb
|
Web: Client: deleted unused image
|
2021-06-08 16:06:07 +03:00 |
|
|
6fee55ac21
|
Web: Settings: Added tKey for data management category and Fixed translations.
|
2021-06-08 15:52:53 +03:00 |
|
|
6db87a3907
|
Backup: Fixed after merge.
|
2021-06-08 15:32:28 +03:00 |
|
|
d9b4611517
|
added ResetApplication translations in Common
|
2021-06-08 15:30:11 +03:00 |
|
|
18cdf1dc95
|
Web: People: fixed translations
|
2021-06-08 15:29:44 +03:00 |
|
Artem Tarasov
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +03:00 |
|
|
65936fb856
|
Web: People: fixed translations
|
2021-06-08 15:25:26 +03:00 |
|
|
d881c48b4b
|
Web: Client: fixed translations
|
2021-06-08 15:20:03 +03:00 |
|
|
6a06707d18
|
Web: People: fixed translations
|
2021-06-08 15:19:49 +03:00 |
|
|
3ef16948fc
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
|
2021-06-08 15:03:49 +03:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|