|
|
216a6480c8
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
|
2023-02-22 15:50:55 +03:00 |
|
|
|
9b36707fbd
|
Web: Changed "DeveloperTools" translation
|
2023-02-14 12:55:16 +03:00 |
|
|
|
c9baec3175
|
Web: Added translation.
|
2023-02-10 11:31:49 +03:00 |
|
|
|
ca2906ebee
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-02-08 12:44:15 +03:00 |
|
|
|
25f8ca42ca
|
Web: Added translations.
|
2023-02-07 16:27:01 +03:00 |
|
Elyor Djalilov
|
3722ae1a77
|
Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization
|
2023-02-06 21:23:32 +05:00 |
|
DmitrySychugov
|
b3d04ccd59
|
Web: Client: added media error ru translation
|
2023-02-06 19:50:55 +05:00 |
|
|
|
68adfe1138
|
Web: Added enable/disable notifications to the context menu.
|
2023-02-06 16:55:19 +03:00 |
|
|
|
6fa291abce
|
Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError
|
2023-02-06 16:32:29 +03:00 |
|
|
|
52fd2400e1
|
Web: Client: Locales: Payment: Added new key: QuotaPaidUserLimitError
|
2023-02-06 15:15:44 +03:00 |
|
Vashchuk Nikita
|
ab7f24a68b
|
Merge branch 'release/rc-v1.2.0' into feature/notifications
|
2023-02-02 18:48:48 +05:00 |
|
Elyor Djalilov
|
2514de24a0
|
Web:Client: Fix translate
|
2023-02-01 17:10:23 +05:00 |
|
Elyor Djalilov
|
baf75b0c42
|
Web:PortalSettings: Changed portal settings navigation
|
2023-02-01 16:49:02 +05:00 |
|
Mushka Nikita
|
5a2b8c871f
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2023-01-30 09:47:48 +03:00 |
|
Mushka Nikita
|
bcbf37b7da
|
created new CreateEditRoomConfirmDialog component
|
2023-01-30 08:14:11 +03:00 |
|
Elyor Djalilov
|
418bc2d3c3
|
Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters.
|
2023-01-27 15:56:07 +05:00 |
|
|
|
14204efc52
|
Web: PortalSettings: Payments: Changed styles according to layouts.
|
2023-01-27 09:59:37 +03:00 |
|
Elyor Djalilov
|
32db1571b6
|
Fix Bug 60689 - Files. Incorrect contents of the Move to Trash confirmation window.
|
2023-01-25 20:29:01 +05:00 |
|
Elyor Djalilov
|
517e138131
|
Fix Bug 60689 - Files. Incorrect contents of the Move to Trash confirmation window
|
2023-01-24 13:24:05 +05:00 |
|
|
|
1db86f8839
|
Web: Moved translation.
|
2023-01-23 11:31:28 +03:00 |
|
|
|
49279cd069
|
Web: Added rooms activity component.
|
2023-01-23 11:21:36 +03:00 |
|
|
|
194156e439
|
Merge branch 'release/rc-v1.2.0' into feature/notifications
|
2023-01-23 10:38:46 +03:00 |
|
|
|
596126f224
|
Web: Added LinkValidTime translation key for invite link
|
2023-01-20 16:59:19 +03:00 |
|
|
|
50cee9ad91
|
Web: Deleted useless translation.
|
2023-01-20 16:52:03 +03:00 |
|
|
|
acbf23e68c
|
Web: Changed logic and styles according to layouts.
|
2023-01-20 16:50:22 +03:00 |
|
Elyor Djalilov
|
1a41d54722
|
Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters
|
2023-01-20 18:11:49 +05:00 |
|
|
|
af09362401
|
Merge branch 'release/rc-v1.2.0' into feature/manage-notifications-panel
# Conflicts:
# packages/client/public/locales/en/Profile.json
# packages/client/public/locales/ru/Profile.json
|
2023-01-20 14:13:00 +03:00 |
|
|
|
cfda2c1313
|
Added translation of empty list alert of third-party services for Room Admin
|
2023-01-19 20:42:32 +03:00 |
|
|
|
b7bad31a55
|
Fix Bug 60621 - Rooms.Settings.ThirdParty. Hide the ability for admins to connect third-party storage when creating a room, if the setting is disabled.
|
2023-01-18 11:36:06 +03:00 |
|
Elyor Djalilov
|
b18618bf04
|
Fix Bug 60601 - Accounts. Delete the data transfer offer from the delete user window
|
2023-01-17 15:30:28 +05:00 |
|
|
|
aa6ed73f61
|
Update FilesSettings.json
|
2023-01-16 20:48:48 +03:00 |
|
|
|
b2e5d8ca9c
|
Fix Bug 60563 - Rooms.ThirdParty. Incorrect 'Third-party services' link in toast when Third-party accounts is disabled.
|
2023-01-16 19:59:09 +03:00 |
|
|
|
2dd8cb623d
|
Web: Updated SSO AttributeMatchingTooltip key translations
|
2023-01-13 17:32:47 +03:00 |
|
|
|
29e6307b3a
|
Removed old Payments code and resources
|
2023-01-12 17:09:52 +03:00 |
|
|
|
2dfb34cb78
|
Removed ManualBackupHelpNote
|
2023-01-12 16:50:47 +03:00 |
|
|
|
7589e06778
|
Update Settings.json
|
2023-01-12 16:33:10 +03:00 |
|
|
|
46b99d1f25
|
Removed old resources (Team titles - custom names)
|
2023-01-12 16:20:35 +03:00 |
|
Viktor Fomin
|
1053e18569
|
Client: change translate, delete old
|
2023-01-12 13:54:42 +03:00 |
|
|
|
093a2a7787
|
Web: Renamed translation keys
|
2023-01-11 20:30:10 +03:00 |
|
|
|
ab353e47b1
|
Removed old resources (Reassign)
|
2023-01-11 20:25:32 +03:00 |
|
|
|
bd0efe1a7e
|
Removed old resources (GroupSelector, AddGroupPanel)
|
2023-01-11 20:04:35 +03:00 |
|
|
|
22acb7f16d
|
Removed old resources (GroupAction)
|
2023-01-11 19:52:31 +03:00 |
|
|
|
ce21c86a87
|
Removed old resources (for third-party-move dialog)
|
2023-01-11 19:17:04 +03:00 |
|
|
|
eb9ff03634
|
Removed old resources (for third-party dialog)
|
2023-01-11 19:08:11 +03:00 |
|
|
|
80566009db
|
Removed old resources (for third-party)
|
2023-01-11 18:53:33 +03:00 |
|
|
|
b80a35dbd5
|
Web: Merged translation keys AuditDownloadText and LoginDownloadText to DownloadStatisticsText
|
2023-01-11 11:18:23 +03:00 |
|
|
|
c2ceab129a
|
Merge branch 'release/rc-v1.2.0' into feature/edit-en
|
2023-01-11 10:57:10 +03:00 |
|
|
|
684d86e110
|
Removed old resource (ConnectMakeShared)
|
2023-01-10 18:52:03 +03:00 |
|
|
|
c65009c1b1
|
Removed old common folder resources (CommonEmptyContainerDescription)
|
2023-01-10 18:43:54 +03:00 |
|
|
|
f952c7474f
|
Removed old empty screen resources (SharedEmptyContainerDescription)
|
2023-01-10 18:40:57 +03:00 |
|
