|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +03:00 |
|
|
|
95aaff4e68
|
Web: api: Changed parameters at url.
|
2021-06-18 11:07:06 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
|
|
3fe118fc3d
|
Web: Components: SaveCancelButtons: Added propType.
|
2021-06-17 09:31:35 +03:00 |
|
|
|
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 |
|
|
|
f9ee63f723
|
Web: Components: FileInput: Deleted debugger.
|
2021-06-15 16:38:33 +03:00 |
|
|
|
d07273cee8
|
Web: Files: fixed display of tree menu, added new api for tree menu
|
2021-06-15 14:15:48 +03:00 |
|
|
|
5db2e8a868
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-11 17:50:28 +03:00 |
|
|
|
52214ade4b
|
Web: Common: Slowed down TopLoaderService show
|
2021-06-11 17:29:29 +03:00 |
|
Artem Tarasov
|
d44f1bee0f
|
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
|
2021-06-11 16:57:17 +03:00 |
|
|
|
e074c0cf93
|
Web: Files: changed color of conversion
|
2021-06-11 16:56:43 +03:00 |
|
|
|
ef59a2ac47
|
Web: Files: added hideConfirmConvert setting
|
2021-06-11 15:49:32 +03:00 |
|
|
|
e0d076a7bc
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-11 15:17:35 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|
Artem Tarasov
|
1073da9d58
|
Web: deleted unnecessary code
|
2021-06-11 14:55:53 +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 |
|
|
|
59bab6a085
|
Web: Files: fixed conversion progress
|
2021-06-09 13:28:22 +03:00 |
|
|
|
93c2f7fb07
|
Web: Component: added tooltipColor for help button
|
2021-06-09 04:02:58 +03:00 |
|
|
|
6fcddbcefa
|
Web: Components: added color for tooltip
|
2021-06-09 04:02:28 +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 |
|
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 |
|
Artem Tarasov
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +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 |
|
|
|
4d9c26545e
|
Web: Files: added conversion progress
|
2021-06-07 16:20:18 +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 |
|
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +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 |
|
|
|
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 |
|
|
|
60a7e84f60
|
Web: ProfileAction : Added locale usage for DateInput
|
2021-06-02 12:04:26 +03:00 |
|
|
|
908310041f
|
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
|
2021-06-02 10:59:07 +03:00 |
|
Artem Tarasov
|
a38195d506
|
Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
|
2021-06-02 10:23:08 +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 |
|
|
|
99908bb334
|
Web: Settings: Backup: Added fixed width for time option for schedule component.
|
2021-05-27 15:53:44 +03:00 |
|
|
|
792430a0c6
|
Web: Components: fixed combobox clickability
|
2021-05-27 14:50:23 +03:00 |
|
|
|
3ad8b7e1dc
|
Web: Components: fixed row checkbox clickability
|
2021-05-27 13:27:08 +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 |
|
Alexey Kostenko
|
727804180b
|
Revert "Web: Common: Added InfiniteLoader"
This reverts commit 09ff37ac0f.
|
2021-05-27 10:38:06 +03:00 |
|
|
|
757e90ee7a
|
Web: Components: fixed help-button iconName path
|
2021-05-26 17:16:32 +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 |
|
Alexey Kostenko
|
09ff37ac0f
|
Web: Common: Added InfiniteLoader
|
2021-05-24 16:24:11 +03:00 |
|
