Commit Graph

390 Commits

Author SHA1 Message Date
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
7073fc2fce Web: Changed translation. 2022-11-07 10:43:32 +03:00
dbd34303f1 Web: Fixed translation key. 2022-11-07 10:41:35 +03:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
mushka
83ecc297b8 Merge branch 'develop' into feature/info-panel-update 2022-11-03 17:09:41 +03:00
mushka
75c8f03149 added SuccessSentMultipleInvitatios translation keys to en/ and ru/ 2022-11-03 17:05:26 +03:00
c24976d7a9 Web: Files: added RoomPinned RoomUnpinned translations 2022-11-03 15:47:35 +03:00
mushka
bb16de4ed9 Merge branch 'develop' into feature/info-panel-update and solved merge conflict 2022-11-03 14:52:11 +03:00
a7b761aaaa Merge branch 'develop' into feature/whitelabel 2022-11-02 19:17:48 +03:00
Viktor Fomin
954ccc79d6 Client: change logo 2022-11-01 15:51:42 +05:00
Viktor Fomin
2afea89545 Merge branch 'develop' into feature/whitelabel 2022-11-01 15:25:52 +05:00
TimofeyBoyko
916104ea01 Merge branch 'develop' into feature/rooms-access-rights 2022-11-01 13:23:46 +05:00
Viktor Fomin
a145543f15 Client: change image 2022-10-31 18:56:28 +05:00
Elyor Djalilov
12824c1f03 Web:Client:ActiveSessions: bugfix 2022-10-31 18:27:07 +05:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
TimofeyBoyko
86af8a8921 Web:Client: add new translation key 2022-10-31 15:29:43 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
9c5f86b237 Merge branch 'develop' into feature/invite-accounts 2022-10-27 09:47:54 +03:00
f897d9dd95 Web: Client: Locales: Added "InviteUsers" key and remove duplicates of "RoleRoomAdmin" and "RoleDocSpaceAdmin" 2022-10-27 09:37:56 +03:00
25226c701f Web: Files: fixed DNSSettingsTooltip translation 2022-10-26 13:09:04 +03:00
Elyor Djalilov
6e97edb3d0 Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-10-25 17:41:04 +05:00
mushka
44caa890bd Merge branch 'develop' into feature/info-panel-update 2022-10-25 14:41:39 +03:00
00e6a174df Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 13:17:33 +03:00
8f93c2df54 Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 12:52:43 +03:00
f0ce5a9552 Web: Files: fixed Payments translations 2022-10-25 12:48:58 +03:00
fdb67562d6 Web: Files: added invite users dialog warning for startup plan 2022-10-25 12:09:05 +03:00
5753d9722f Web: Files: added invite users dialog warning, fixed GracePeriodActivatedDescription translation 2022-10-25 11:44:30 +03:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
Viktor Fomin
bc5458bd21 Merge branch 'develop' into feature/portal-deactivation 2022-10-24 18:38:02 +05:00
TimofeyBoyko
30799fa082 Merge branch 'develop' into bugfix/files-context-menu 2022-10-24 14:09:25 +05:00
Elyor Djalilov
7dac877b75 Web:Client:ActiveSessions: added modals 2022-10-21 18:45:50 +05:00
Viktor Fomin
e98bde1362 Client: add translate 2022-10-21 14:01:14 +05:00
Viktor Fomin
025919588c Client: PortalSettings: DeleteData: fix translate 2022-10-21 13:33:38 +05:00
TimofeyBoyko
a8910f6d25 Web:Client: add new context option for room 'Select' 2022-10-21 13:14:43 +05:00
TimofeyBoyko
8bb825cd5b Web:Client: fix translations for archive operations 2022-10-20 21:33:13 +05:00
TimofeyBoyko
51bca252a4 Web:Client: add new translation key for restore all archive dialog 2022-10-20 19:44:18 +05:00
9e0bc49c6f Merge branch 'develop' into feature/portal-deactivation 2022-10-20 15:04:54 +03:00
0d680dd005 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-20 11:36:22 +03:00
TimofeyBoyko
a0da3a1735 Web:Client: add new translation key for EmptyArchiveDialog 2022-10-20 13:11:26 +05:00
TimofeyBoyko
a2e6164ffe Web:Client: add new translation key 'ArchiveAction' 2022-10-20 12:53:50 +05:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
mushka
0adb8efd4c added ExpectPeople translation key 2022-10-19 19:33:57 +03:00
42d9a6682c Merge branch 'develop' into feature/company-info-settings 2022-10-19 17:54:58 +03:00
Elyor Djalilov
d819128bdb Web:Client:ActiveSessions: added translations 2022-10-19 18:30:22 +05:00
4115bdc5dd Web: Files: fixed TrustedMailDescription translation 2022-10-19 16:03:59 +03:00
b99bde994e Web: Files: fixed LanguageTimeSettingsTooltip translation 2022-10-19 16:01:32 +03:00
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
mushka
2a52c0b251 Merge branch 'develop' into feature/room-thirdparty-update 2022-10-19 13:22:09 +03:00
mushka
9e62fc8e45 added translation for root label 2022-10-18 13:14:06 +03:00