|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
|
7f05c219a9
|
added ar
|
2023-08-30 18:20:54 +03:00 |
|
|
|
b5fbebea6f
|
Web: Changed translation for deactivated portal.
|
2023-08-29 17:42:28 +03:00 |
|
|
|
571f272cfb
|
Web: Files: fixed LinkDoesNotExist translation
|
2023-05-19 11:27:36 +03:00 |
|
|
|
1b466d5b38
|
Web: Files: added error pages for public-room
|
2023-05-18 12:05:16 +03:00 |
|
|
|
2cb3d34ed0
|
edited en
|
2023-01-10 17:56:40 +03:00 |
|
Elyor Djalilov
|
7f89e3d2bf
|
unused key removed
|
2022-11-28 22:12:23 +05:00 |
|
Elyor Djalilov
|
642e7d4036
|
unused key removed
|
2022-11-28 22:11:18 +05:00 |
|
|
|
91ea939069
|
Client: add translate
|
2022-08-22 12:27:04 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
