Commit Graph

421 Commits

Author SHA1 Message Date
Elyor Djalilov
91932d5715 unused key removed 2022-11-28 12:10:01 +05:00
Elyor Djalilov
7b19ca5754 empty value keys fixed 2022-11-28 12:07:17 +05:00
Elyor Djalilov
6fffbed1e3 unused key removed 2022-11-28 12:02:58 +05:00
Elyor Djalilov
254e21515b unused key removed 2022-11-28 11:58:42 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
b3ce916889 empty value keys fixed 2022-11-26 15:01:16 +05:00
Elyor Djalilov
ad1a6c4d4d Fix bad merge 2022-11-26 14:41:58 +05:00
Elyor Djalilov
a54463de2a empty value keys fixed 2022-11-26 14:28:36 +05:00
Elyor Djalilov
d462eac7c3 empty value keys fixed 2022-11-26 14:19:37 +05:00
Elyor Djalilov
1775ba9fe9 empty value keys fixed 2022-11-26 14:18:20 +05:00
Elyor Djalilov
bc729a8847 Fix bad merge 2022-11-26 13:47:40 +05:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
d3d91ba54e Merge branch 'develop' into feature/custom-theme 2022-11-23 19:57:15 +03:00
6132883419 Web: fixed mark as read icon 2022-11-23 12:10:22 +03:00
b11e857291 Web:Client:Add translation for ColorSchemeDialog. 2022-11-21 18:39:33 +03:00
304f47adaf Merge branch 'feature/custom-theme' of github.com:ONLYOFFICE/AppServer into feature/custom-theme 2022-11-21 15:51:35 +03:00
6c4d62fe27 Web:Client:Added translations per country with themes. 2022-11-21 15:51:19 +03:00
TimofeyBoyko
0e822663ae Web:Client:EmptyContainer: fix empty screen for archived room 2022-11-18 14:34:43 +03:00
TimofeyBoyko
5694bc0678 Web:Client:EmptyScreen: fix header text 2022-11-17 14:36:01 +03:00
TimofeyBoyko
a95df80f75 Web:Client:Locales: add new translation keys for empty screen 2022-11-17 13:45:05 +03:00
TimofeyBoyko
7fa1fddf79 Web:Client: fix translation keys 2022-11-10 15:54:53 +03:00
TimofeyBoyko
cb9eb34733 Web:Client: add delete room dialog 2022-11-10 15:22:13 +03:00
TimofeyBoyko
a763087b78 Web:Client: add Archive dialog for archive rooms and restore rooms operations 2022-11-10 13:18:55 +03:00
TimofeyBoyko
e84cdf861f Web:Client: add new translation key for restore archive dialog 2022-11-10 12:12:08 +03:00
TimofeyBoyko
48f67493b6 Web:Client: add new translation kets for move to archived dialog 2022-11-10 11:35:08 +03:00
TimofeyBoyko
a0c4b1e111 Web:Client: change 'Archive' translation key 2022-11-10 11:25:28 +03:00
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
213df04281 Added empty translations 2022-10-27 11:58:03 +03:00
4636136df2 Update Settings.json 2022-10-27 11:57:21 +03:00
0e868c01ae Merge branch 'develop' into feature/new-docspace-translations 2022-10-27 11:56:46 +03: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