|
c257b501fe
|
Web: Files: SelectFileDialog: Changed api parameters.
|
2021-06-16 14:17:12 +03:00 |
|
|
058445461b
|
Web: Files: Added SelectFile component for documents, refactoring.
|
2021-06-15 18:11:48 +03:00 |
|
|
0663ed7f16
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-06-10 11:56:32 +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 |
|
|
41ef020616
|
Web: Common: added backupCodes in tfa store
|
2021-06-08 14:19:36 +03:00 |
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +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 |
|
|
908310041f
|
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
|
2021-06-02 10:59:07 +03:00 |
|
|
7026b19db0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-31 09:23:53 +03:00 |
|
|
49c77907bd
|
Web: Common: fixed error message
|
2021-05-30 22:48:04 +03:00 |
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
|
f993108d69
|
Web: Common: commentary changes
|
2021-05-30 17:26:30 +03:00 |
|
|
74064fc76d
|
Merge branch 'develop' into feature/translations
|
2021-05-29 21:59:02 +03:00 |
|
|
72527ccded
|
Merge branch 'master' into develop
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-05-29 21:57:42 +03:00 |
|
|
d585c0a785
|
Web: Bumped version to 0.1.10
|
2021-05-29 21:26:13 +03:00 |
|
|
a088e020ad
|
Web: Delete useless code and Refactoring.
|
2021-05-27 13:22:53 +03:00 |
|
|
25ac98e272
|
Merge branch 'develop' into feature/translations
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
|
2021-05-27 11:13:41 +03:00 |
|
|
1e954b15d7
|
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
|
2021-05-24 19:05:29 +03:00 |
|
|
1b940de5e2
|
Web: Common: removed I18nextProvider from PageLayout
|
2021-05-24 16:24:23 +03:00 |
|
|
66b30360de
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-05-21 17:21:16 +03:00 |
|
|
389ee969a2
|
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
|
2021-05-21 17:19:00 +03:00 |
|
|
facf0a01cf
|
Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json"
|
2021-05-21 16:37:46 +03:00 |
|
|
14214f2ad8
|
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
|
2021-05-21 15:00:30 +03:00 |
|
|
cda77e1234
|
Merge branch 'develop' into bugfix/context-actions
|
2021-05-20 13:24:18 +03:00 |
|
|
af2f24e4ac
|
Merge branch 'develop' into feature/translations
|
2021-05-20 13:11:13 +03:00 |
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
|
408f432be6
|
Web: Common: added urls on authenticator app
|
2021-05-20 06:37:56 +03:00 |
|
|
b2611343b6
|
Web: Common: get old backup codes
|
2021-05-20 01:44:03 +03:00 |
|
|
4e57f2a47f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-20 00:47:45 +03:00 |
|
|
37267b624f
|
Web: Common: added method for login with code and cookie
|
2021-05-19 18:21:40 +03:00 |
|
|
8785f6151a
|
Web: Common: fixed reloading login page
|
2021-05-19 17:17:07 +03:00 |
|
|
03a71ae131
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
|
2021-05-19 17:11:46 +03:00 |
|
|
3c6f831618
|
Web: Common: Api: Added removeShareFiles api method
|
2021-05-19 16:51:43 +03:00 |
|
|
2520544ad0
|
Web: Settings: Backup: Added possibility to disable options and added logic for third-party storage for manual backup.
|
2021-05-19 15:34:26 +03:00 |
|
|
d55c953805
|
Web: Files: fixed MediaViewer propTypes
|
2021-05-19 13:45:37 +03:00 |
|
|
536c6c2f5e
|
Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
|
2021-05-19 11:14:44 +03:00 |
|
|
b1b6bdc516
|
Web: Common: refactoring tfa store
|
2021-05-19 03:48:13 +03:00 |
|
|
07934f6cd9
|
Web: Common: fixed firefox header
|
2021-05-18 17:59:34 +03:00 |
|
|
20403e2c98
|
Web: Common: reset tfa app
|
2021-05-17 23:28:52 +03:00 |
|
|
e87e0272ae
|
Web: Common: get tfa backup codes
|
2021-05-17 17:32:12 +03:00 |
|
|
d34e1eeaa6
|
Web: Common: deleted console.log
|
2021-05-17 16:54:21 +03:00 |
|
|
cce7b94d5d
|
Web: Common: deleted console.log
|
2021-05-17 16:52:38 +03:00 |
|
|
fadd46112c
|
Web: Common: added login with tfa code method, fixed url
|
2021-05-17 16:33:01 +03:00 |
|
|
f5998b650a
|
Web: Common: added login with tfa code method
|
2021-05-17 16:32:40 +03:00 |
|
|
bb8124d1fa
|
Web: Common: added login with tfa code method
|
2021-05-17 16:32:22 +03:00 |
|
|
77f17d55b6
|
Web: Common: redirect on confirm page
|
2021-05-14 15:59:15 +03:00 |
|
|
9b54835996
|
Web: Common: get secret key and qr
|
2021-05-14 15:58:50 +03:00 |
|
|
85bd971735
|
Merge branch 'develop' into feature/translations
|
2021-05-14 12:07:48 +03:00 |
|
|
eb628d3703
|
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
|
2021-05-14 11:34:10 +03:00 |
|
|
1a58007fcd
|
Web: Common: removed custom selection frame
|
2021-05-14 11:21:59 +03:00 |
|