|
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 |
|
|
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 |
|
Artem Tarasov
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +03:00 |
|
|
d881c48b4b
|
Web: Client: fixed translations
|
2021-06-08 15:20:03 +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 |
|
|
9c5a960d40
|
Web: Client: submit by numpad enter
|
2021-06-08 13:09:46 +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 |
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
54d5c658bd
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-07 11:54:06 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
f21188b5cb
|
Web: Client: fixed wizard culture
|
2021-06-03 12:22:38 +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 |
|
|
e05f2bfec5
|
Web: Settings: Manual Backup: Fixed styles.
|
2021-06-02 16:41:48 +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 |
|
|
c91b1090f9
|
Web: Settings: Manual/Auto Backup: Fixed required fields for aws storage.
|
2021-06-02 14:47:17 +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 |
|
|
28c5325137
|
Web: Settings: Manual/Auto Backup: Splitted third-party storage module for manual and auto modules.
|
2021-06-02 13:19:42 +03:00 |
|
Artem Tarasov
|
418f7161c5
|
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
|
2021-06-02 12:22:57 +03:00 |
|
Artem Tarasov
|
2d8b044458
|
Web: fixed usage translation key "Settings" in NavMenu
|
2021-06-02 12:22:38 +03:00 |
|
|
77242ad326
|
Web: Client: fixed TimeZone translation
|
2021-06-02 11:58:41 +03:00 |
|
|
11640e211c
|
Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage"
|
2021-06-02 11:33:26 +03:00 |
|
|
3f964a1649
|
Web: Fix not translated toast issue ("Successfully sent")
|
2021-06-02 11:12:47 +03:00 |
|
|
929adc773a
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-06-02 10:59:15 +03:00 |
|
|
908310041f
|
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
|
2021-06-02 10:59:07 +03:00 |
|
|
7ce24557e0
|
Web: Client: fixed toast translations
|
2021-06-02 10:58:11 +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 |
|
|
948ee10020
|
Web: Settings: Auto Backup: Refactoring.
|
2021-06-02 10:19:55 +03:00 |
|
|
2bfc86c506
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-01 21:16:44 +03:00 |
|
|
1c3a37508d
|
Web: Settings: Manual/Auto: Splitted third-party storage module into components and separated of logic for repositories.
|
2021-06-01 21:14:16 +03:00 |
|
|
95dbfb8c5c
|
Merge branch 'develop' into feature/translations
|
2021-06-01 20:02:48 +03:00 |
|
|
23e1083be7
|
Web: Removed empty translations keys
|
2021-06-01 13:49:37 +03:00 |
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
de98856728
|
Web: Tests: Added new 'sk' translations;
|
2021-06-01 11:21:39 +03:00 |
|
|
8e532bc8b9
|
Web: Tests: Added new 'ro' translations;
|
2021-06-01 11:20:14 +03:00 |
|
|
3d62da4422
|
Web: Tests: Added new 'pt-BR' translations;
|
2021-06-01 11:19:13 +03:00 |
|
|
c5a5072aa7
|
Web: Tests: Added new 'lo' translations;
|
2021-06-01 11:17:19 +03:00 |
|
|
8eb62d8079
|
Web: Tests: Added new 'it' translations;
|
2021-06-01 11:15:24 +03:00 |
|
|
a0fc465678
|
Web: Tests: Added new 'fr' translations;
|
2021-06-01 11:13:50 +03:00 |
|
|
e3b5ac774a
|
Web: Tests: Added new 'de' translations;
|
2021-06-01 10:56:47 +03:00 |
|
|
7beccd192b
|
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
|
2021-05-31 20:33:12 +03:00 |
|
|
2018820472
|
Merge branch 'develop' into feature/crm-migrate
|
2021-05-31 19:37:51 +03:00 |
|
|
061b4e46e7
|
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
|
2021-05-31 19:11:58 +03:00 |
|
|
e2b9561d7b
|
Web: Rewritten all json translation files with sorting of properties alphabetically
|
2021-05-31 18:34:15 +03:00 |
|
|
f78742ac39
|
Web: Fix UselessModuleTranslationKeysTest issues
|
2021-05-31 17:35:25 +03:00 |
|
|
6b56b539c5
|
Web: Update EN language
|
2021-05-31 17:10:34 +03:00 |
|
|
569a6881b0
|
Web: Settings: Auto Backup: Fixed month and time options styles.
|
2021-05-31 14:27:23 +03:00 |
|
|
d9bac1abdf
|
Web: Settings: Auto Backup: Fixed max input width for options.
|
2021-05-31 14:19:57 +03:00 |
|
|
f30b84fddf
|
Web: Client: fixed group buttons menu
|
2021-05-31 13:57:19 +03:00 |
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
191781e2da
|
Web: Settings: Auto Backup: Added help url for third-party resource.
|
2021-05-31 13:16:01 +03:00 |
|
|
e35ab9d886
|
Web: Settings: Backup: Remove styled component to styled-backup and Refactorng.
|
2021-05-31 13:07:34 +03:00 |
|
|
889c99243e
|
Web: Client: added translations
|
2021-05-31 13:05:19 +03:00 |
|
|
6b20b6ee4a
|
Web: Client: added AddAdmin button
|
2021-05-31 13:05:06 +03:00 |
|
|
8381b7da75
|
Merge branch 'feature/access-rights-admins' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
|
2021-05-31 12:57:43 +03:00 |
|
|
611a6a67b4
|
Web: Client: fixed
|
2021-05-31 12:53:48 +03:00 |
|
|
9913bc27ca
|
Web: Settings: Backup: Fixed styles.
|
2021-05-31 12:52:00 +03:00 |
|
|
66f36bf0a6
|
Web: Client: added empty screen
|
2021-05-31 12:51:23 +03:00 |
|
Alexey Kostenko
|
df44f98e53
|
Web: Client: Fixed the number of administrators on access-rights page
|
2021-05-31 12:45:27 +03:00 |
|
|
4549148d55
|
Web: Settings: Backup: Fixed folder id, added certainFolders prop for SelectedFolder and Refactoring.
|
2021-05-31 12:43:33 +03:00 |
|
|
7026b19db0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-31 09:23:53 +03:00 |
|
Alexey Kostenko
|
0374ff6c5d
|
Web: Client: Fixed adding and removing users (with paging), set url filter when come from access-rights page
|
2021-05-31 09:23:24 +03:00 |
|
|
f327a89f4a
|
Web: Settings: Manual/ Auto Backup: Added saving folder id for manual backup and Refactoring.
|
2021-05-30 23:36:44 +03:00 |
|
|
f0f6400563
|
Web: Client: commentary changes
|
2021-05-30 22:40:44 +03:00 |
|
|
ca3b5de1e5
|
Web: Settings: Manual Backup: Added showing selected folder path for Documents and Third-resource module.
|
2021-05-30 22:38:31 +03:00 |
|
|
03947c0d7a
|
Web: Settings: Manual/Auto Backup: Added redirect to manual backup when clicked on floating button.
|
2021-05-30 21:57:46 +03:00 |
|
|
f9feb35afc
|
Merge branch 'develop' into feature/backup
|
2021-05-30 20:57:01 +03:00 |
|
Alexey Kostenko
|
90973fa769
|
Web: Client: Fixed header name on admins page, fixed value of admins on access-rights page, added filter to url on admins page
|
2021-05-30 19:11:16 +03:00 |
|
|
68d9f90faf
|
Web: Client: commentary changes
|
2021-05-30 17:27:31 +03:00 |
|
|
f993108d69
|
Web: Common: commentary changes
|
2021-05-30 17:26:30 +03:00 |
|
Alexey Kostenko
|
095b79dc31
|
Web: Client: Added Paging on admins page
|
2021-05-30 16:00:05 +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 |
|
|
315544cb8d
|
Web: Settings: Manual Backup: Added saving type of storage to the session storage and Added loaders when is saving process.
|
2021-05-28 16:15:01 +03:00 |
|
Artem Tarasov
|
215c933d9e
|
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
|
2021-05-28 13:28:40 +03:00 |
|
|
7896f0d5aa
|
Web: Settings: Auto Backup: Added lost prop.
|
2021-05-28 13:20:53 +03:00 |
|
|
12bcf816b5
|
Web: Client: added new translations keys
|
2021-05-28 12:09:10 +03:00 |
|
|
d0bbcb8d5a
|
Files: moved from 08a01422
|
2021-05-28 11:22:35 +03:00 |
|
|
e19b333e87
|
Web: Settings: Auto Backup: Fixed check changes for Documents Module.
|
2021-05-28 11:08:28 +03:00 |
|
|
eee7b67037
|
Web: Settings: Auto Backup: Added selected options to the session storage for Documents and ThirdParty resources Module and Refactoring.
|
2021-05-28 10:56:24 +03:00 |
|
|
527a650601
|
WebStudio: resources
|
2021-05-27 21:30:15 +03:00 |
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
Alexey Kostenko
|
7435ee0c7b
|
Web: Client: Fixed pages (infinite loading, when portal has no admins)
|
2021-05-27 19:12:50 +03:00 |
|
|
89965f0c54
|
Web: Settings: Auto Backup: Deleted checkbox from schedule component.
|
2021-05-27 16:05:24 +03:00 |
|
|
99908bb334
|
Web: Settings: Backup: Added fixed width for time option for schedule component.
|
2021-05-27 15:53:44 +03:00 |
|
Alexey Kostenko
|
b1cf90b591
|
Web: Client: Admins page - style fix (temporary solution for desktop)
|
2021-05-27 15:40:11 +03:00 |
|
Alexey Kostenko
|
4269bde116
|
Web: Client: Added rows loader to admins page, fixed when switching between admins - access-rights (Blank screen for a few seconds), small refactoring loader on access-rights page
|
2021-05-27 15:22:25 +03:00 |
|
|
90821d3fe1
|
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
|
2021-05-27 12:15:53 +03:00 |
|
|
f5909cc0e0
|
Web: Temporary removed minimal translations lng files
|
2021-05-27 12:14:36 +03:00 |
|