Elyor Djalilov
|
1c929c76dc
|
unused key removed
|
2022-11-30 15:27:29 +05:00 |
|
Elyor Djalilov
|
21855e992d
|
unused key removed
|
2022-11-30 15:26:30 +05:00 |
|
Elyor Djalilov
|
96020455bd
|
unused key removed
|
2022-11-30 15:26:07 +05:00 |
|
Elyor Djalilov
|
30c0cc2134
|
unused key removed
|
2022-11-30 15:25:41 +05:00 |
|
Elyor Djalilov
|
8d930f9830
|
unused key removed
|
2022-11-30 15:25:14 +05:00 |
|
Elyor Djalilov
|
3c430abfef
|
unused key removed
|
2022-11-30 15:24:49 +05:00 |
|
Elyor Djalilov
|
18a8b5a371
|
unused key removed
|
2022-11-30 15:24:05 +05:00 |
|
Elyor Djalilov
|
139d313670
|
unused key removed
|
2022-11-30 15:23:36 +05:00 |
|
Elyor Djalilov
|
982ab9e047
|
unused key removed
|
2022-11-30 15:23:02 +05:00 |
|
Elyor Djalilov
|
7b71164aac
|
unused key removed
|
2022-11-30 15:22:31 +05:00 |
|
Elyor Djalilov
|
c3e702bbf5
|
unused key removed
|
2022-11-30 15:21:15 +05:00 |
|
Elyor Djalilov
|
aa097121c4
|
unused key removed
|
2022-11-30 15:15:05 +05:00 |
|
Elyor Djalilov
|
9bcb2be434
|
unused key removed
|
2022-11-30 15:13:05 +05:00 |
|
Elyor Djalilov
|
37e15bb90b
|
unused key removed
|
2022-11-30 15:12:40 +05:00 |
|
Elyor Djalilov
|
eb21deff5c
|
unused key removed
|
2022-11-30 15:10:05 +05:00 |
|
Elyor Djalilov
|
f7ef99c00d
|
unused key removed
|
2022-11-30 15:08:06 +05:00 |
|
Elyor Djalilov
|
1a5ecc1f5a
|
unused key removed
|
2022-11-30 15:07:02 +05:00 |
|
Elyor Djalilov
|
a2ea616c77
|
unused key removed
|
2022-11-30 15:04:50 +05:00 |
|
Elyor Djalilov
|
02218f522a
|
unused key removed
|
2022-11-30 15:04:02 +05:00 |
|
Elyor Djalilov
|
6a61438766
|
unused key removed
|
2022-11-30 15:03:34 +05:00 |
|
Elyor Djalilov
|
9b35c5735a
|
unused key removed
|
2022-11-30 15:02:14 +05:00 |
|
Elyor Djalilov
|
5ffd47d754
|
deleted duplicate key
|
2022-11-30 14:53:26 +05:00 |
|
Elyor Djalilov
|
69ebe3b38a
|
deleted duplicate key
|
2022-11-30 14:33:22 +05:00 |
|
Elyor Djalilov
|
7c32906fa7
|
not translated toasts fixed
|
2022-11-30 14:14:29 +05:00 |
|
Elyor Djalilov
|
a9188bfd59
|
not found keys fixed
|
2022-11-29 15:28:24 +05:00 |
|
Elyor Djalilov
|
353a3670f8
|
unused key removed
|
2022-11-29 13:56:32 +05:00 |
|
Elyor Djalilov
|
e4b077f69b
|
key was moved to the Common
|
2022-11-29 00:39:03 +05:00 |
|
Elyor Djalilov
|
af4bcf4c05
|
deleted duplicate keys
|
2022-11-28 23:01:07 +05:00 |
|
Elyor Djalilov
|
89fe900387
|
deleted duplicate keys
|
2022-11-28 22:54:54 +05:00 |
|
Elyor Djalilov
|
8951cf62fc
|
deleted duplicate keys
|
2022-11-28 22:50:56 +05:00 |
|
Elyor Djalilov
|
04db0e8f0a
|
deleted duplicate key and was moved to the Common
|
2022-11-28 22:46:57 +05:00 |
|
Elyor Djalilov
|
23109e30c2
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 22:19:57 +05: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 |
|
Elyor Djalilov
|
b3b6615226
|
deleted duplicate key
|
2022-11-28 22:03:20 +05:00 |
|
Elyor Djalilov
|
d88331c704
|
deleted duplicate keys
|
2022-11-28 21:41:21 +05:00 |
|
Elyor Djalilov
|
b924f1582d
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 15:37:10 +05:00 |
|
Elyor Djalilov
|
3c637dbaa2
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 15:19:44 +05:00 |
|
Elyor Djalilov
|
6ac2aceb64
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 14:55:18 +05:00 |
|
Elyor Djalilov
|
c628368e9b
|
deleted duplicate keys
|
2022-11-28 13:26:08 +05:00 |
|
Elyor Djalilov
|
c6f5db2486
|
unused key removed
|
2022-11-28 12:12:42 +05:00 |
|
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 |
|
Viktor Fomin
|
989b965841
|
Client: fix translate
|
2022-11-24 12:57:38 +05:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
Viktor Fomin
|
fd181baae3
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 15:01:42 +05:00 |
|
|
|
6132883419
|
Web: fixed mark as read icon
|
2022-11-23 12:10:22 +03:00 |
|
Viktor Fomin
|
b602497021
|
Client: rename logos
|
2022-11-23 06:19:52 +05:00 |
|
|
|
4b180094e8
|
Whitelabel: rename
|
2022-11-22 18:03:59 +03:00 |
|
Viktor Fomin
|
3f59849627
|
Client: fix logos
|
2022-11-22 14:48:16 +05: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 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48: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 |
|
|
|
b379931d1f
|
fix whitelabel
|
2022-11-15 14:11:44 +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 |
|
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 |
|
|
|
073aa9943f
|
Fix WrongTranslationVariablesTest issues + added missing files and key sorting
|
2022-10-25 14:52:15 +03: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 |
|
|
|
a5165d09cf
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-18 10:31:15 +03:00 |
|
mushka
|
3008e549c9
|
fixed some small translation issues with info panel
|
2022-10-18 01:55:45 +03:00 |
|
TimofeyBoyko
|
d208b8c726
|
Web:Client:fix translation key
|
2022-10-17 16:22:31 +05:00 |
|
TimofeyBoyko
|
54b7f99f8e
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 16:06:33 +05:00 |
|
TimofeyBoyko
|
e5ab98c0d9
|
Web:Client: add new translation key for main bar
|
2022-10-17 16:01:12 +05:00 |
|
|
|
1fac4168fe
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-17 11:02:59 +03:00 |
|
TimofeyBoyko
|
b1d63436cc
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-17 11:53:38 +05:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
|
|
8146e9aef4
|
Merge branch 'develop' into feature/portal-deactivation
|
2022-10-15 13:43:10 +05:00 |
|
|
|
88e78f6695
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-14 17:18:56 +03:00 |
|
TimofeyBoyko
|
470c100e2f
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-14 12:26:16 +05:00 |
|
|
|
e80cc33dfb
|
Merge branch 'feature/room-thirdparty-update' into feature/shared-redesign-third-party
|
2022-10-13 18:51:45 +03:00 |
|
TimofeyBoyko
|
32994832e4
|
Web:Client:EmptyContainer: add new translaton key for free user at shared empty page
|
2022-10-13 19:14:20 +05:00 |
|
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
mushka
|
319d842312
|
fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian
|
2022-10-13 15:12:58 +03:00 |
|
|
|
3bd63b26fe
|
Web: Added new translations.
|
2022-10-13 15:06:51 +03:00 |
|
|
|
73fa3205e2
|
Web:Client:Add small icon thirdParty.
|
2022-10-13 14:16:27 +03:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
|
08379aeaa3
|
Web:Client:Delete small icons.
|
2022-10-12 17:21:42 +03:00 |
|
|
|
c51e42f2f4
|
Web:Client:Delete wrong translation "ThirdPartyResource".
|
2022-10-12 13:47:43 +03:00 |
|
