|
|
b72cf10ccf
|
Web: Client: Changed deploy statics (added loaders)
|
2022-12-09 10:33:03 +03:00 |
|
Viktor Fomin
|
186fad00c9
|
Client: fix
|
2022-12-08 17:00:30 +03:00 |
|
Mushka Nikita
|
0aaf8d7c27
|
fixed bug with loaders in formGallery infoPanel
|
2022-12-08 14:33:50 +03:00 |
|
|
|
895995f8bb
|
Web: Files: fixed group-menu styles, added new translation Pin
|
2022-12-07 12:46:32 +03:00 |
|
Viktor Fomin
|
15ff7aa19d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-06 16:50:55 +03:00 |
|
|
|
c74d98edb9
|
Web: Files: fixed arrow icon
|
2022-12-06 12:27:32 +03:00 |
|
|
|
54a6eb9eec
|
Update Files.json
Removed !
|
2022-12-05 19:23:23 +03:00 |
|
|
|
bc01d0ef49
|
Web: Added new icon for payment page.
|
2022-12-05 13:38:29 +03:00 |
|
|
|
8e0bc0a732
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-02 19:56:43 +03:00 |
|
|
|
c3578d1661
|
Fix EnDublicatesByContentTest issues
|
2022-12-02 18:58:36 +03:00 |
|
|
|
dd4260acaa
|
Update Settings.json
Fix NotFoundKeysTest issues
|
2022-12-02 17:02:55 +03:00 |
|
|
|
b73c4a8762
|
Web: Removed useless translations
|
2022-12-02 16:29:52 +03:00 |
|
|
|
c0d1645b45
|
Fix some UselessTranslationKeysTest issues
|
2022-12-02 15:56:05 +03:00 |
|
Viktor Fomin
|
b8b0fe9139
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-02 14:55:23 +03:00 |
|
|
|
0f96d279d3
|
Fix some UselessTranslationKeysTest issues
|
2022-12-02 14:28:02 +03:00 |
|
|
|
b0a8c93054
|
Merge branch 'develop' into feature/new-docspace-translations
|
2022-12-01 18:43:19 +03:00 |
|
|
|
c84faa2bc0
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-01 17:57:55 +03:00 |
|
|
|
3b70343764
|
Fix NotAllLanguageTranslatedTest issues
|
2022-12-01 13:38:03 +03:00 |
|
Elyor Djalilov
|
903165679a
|
incorrectly deleted file
|
2022-11-30 22:28:58 +05:00 |
|
Elyor Djalilov
|
5d5eb5c7ca
|
unused key removed
|
2022-11-30 20:17:18 +05:00 |
|
Elyor Djalilov
|
db496b990c
|
unused key removed
|
2022-11-30 20:13:49 +05:00 |
|
Elyor Djalilov
|
86b004072e
|
unused key removed
|
2022-11-30 20:11:51 +05:00 |
|
Elyor Djalilov
|
cc7ee46838
|
unused key removed
|
2022-11-30 20:10:08 +05:00 |
|
Elyor Djalilov
|
01150b19d8
|
unused key removed
|
2022-11-30 20:06:15 +05:00 |
|
Elyor Djalilov
|
cbf6e57e4b
|
unused key removed
|
2022-11-30 20:03:45 +05:00 |
|
Elyor Djalilov
|
ddd4a8fe48
|
unused key removed
|
2022-11-30 20:01:03 +05:00 |
|
Timofey Boyko
|
9230bf1a63
|
Web:Client: add new translation key 'SearchByOwner'
|
2022-11-30 17:35:12 +03:00 |
|
Elyor Djalilov
|
044c506b03
|
unused key removed
|
2022-11-30 19:23:51 +05:00 |
|
Elyor Djalilov
|
a8fdc663ae
|
unused key removed
|
2022-11-30 19:23:23 +05:00 |
|
Elyor Djalilov
|
333c6bf92a
|
unused key removed
|
2022-11-30 19:23:00 +05:00 |
|
Elyor Djalilov
|
4eb2b63838
|
unused key removed
|
2022-11-30 19:19:55 +05:00 |
|
Elyor Djalilov
|
25c8ae6805
|
unused key removed
|
2022-11-30 19:17:52 +05:00 |
|
Elyor Djalilov
|
b07e081bf6
|
unused key removed
|
2022-11-30 19:17:23 +05:00 |
|
Elyor Djalilov
|
17c22d6eb9
|
unused key removed
|
2022-11-30 19:16:40 +05:00 |
|
Elyor Djalilov
|
bdfb09b35b
|
unused key removed
|
2022-11-30 19:14:44 +05:00 |
|
Elyor Djalilov
|
55a02bc242
|
unused key removed
|
2022-11-30 19:12:55 +05:00 |
|
Elyor Djalilov
|
6377faa541
|
unused key removed
|
2022-11-30 19:09:29 +05:00 |
|
Elyor Djalilov
|
6d89b2ed09
|
unused key removed
|
2022-11-30 19:08:52 +05:00 |
|
Elyor Djalilov
|
2006b9e798
|
unused key removed
|
2022-11-30 19:06:55 +05:00 |
|
Elyor Djalilov
|
587a6b3c4e
|
unused key removed
|
2022-11-30 19:04:49 +05:00 |
|
Elyor Djalilov
|
d4b2919597
|
unused key removed
|
2022-11-30 19:04:17 +05:00 |
|
Elyor Djalilov
|
a365d1a395
|
unused key removed
|
2022-11-30 19:03:16 +05:00 |
|
Elyor Djalilov
|
f0b5e55189
|
unused key removed
|
2022-11-30 19:01:00 +05:00 |
|
Elyor Djalilov
|
af3a7b6575
|
unused key removed
|
2022-11-30 18:58:44 +05:00 |
|
Elyor Djalilov
|
a38c249bdb
|
unused key removed
|
2022-11-30 18:56:35 +05:00 |
|
Elyor Djalilov
|
7572dcb5f4
|
unused key removed
|
2022-11-30 18:54:28 +05:00 |
|
Elyor Djalilov
|
3243e201ea
|
unused key removed
|
2022-11-30 18:52:55 +05:00 |
|
Elyor Djalilov
|
5fa7e8efa2
|
unused key removed
|
2022-11-30 18:50:47 +05:00 |
|
Elyor Djalilov
|
917827696b
|
unused key removed
|
2022-11-30 18:48:26 +05:00 |
|
Elyor Djalilov
|
f65003ec1b
|
unused keys removed
|
2022-11-30 18:46:18 +05:00 |
|
Elyor Djalilov
|
3207cdb6b0
|
unused key removed
|
2022-11-30 18:34:45 +05:00 |
|
Elyor Djalilov
|
802567ada2
|
unused key removed
|
2022-11-30 18:33:10 +05:00 |
|
Elyor Djalilov
|
33c333ab6c
|
unused key removed
|
2022-11-30 18:00:02 +05:00 |
|
Elyor Djalilov
|
125a65187c
|
unused key removed
|
2022-11-30 17:44:50 +05:00 |
|
Elyor Djalilov
|
6011d39ea5
|
unused key removed
|
2022-11-30 17:42:59 +05:00 |
|
Elyor Djalilov
|
7fa5d0a3be
|
unused key removed
|
2022-11-30 17:40:51 +05:00 |
|
Elyor Djalilov
|
dfa6b98487
|
unused key removed
|
2022-11-30 17:39:04 +05:00 |
|
Elyor Djalilov
|
21f6122282
|
unused key removed
|
2022-11-30 17:37:01 +05:00 |
|
Elyor Djalilov
|
ce60f52154
|
unused key removed
|
2022-11-30 17:24:35 +05:00 |
|
Elyor Djalilov
|
55094377ac
|
unused key removed
|
2022-11-30 17:20:58 +05:00 |
|
Elyor Djalilov
|
b044d18b61
|
unused key removed
|
2022-11-30 17:18:40 +05:00 |
|
Elyor Djalilov
|
f7a4d48d61
|
unused key removed
|
2022-11-30 17:16:50 +05:00 |
|
Elyor Djalilov
|
5697a644a6
|
unused key removed
|
2022-11-30 17:15:08 +05:00 |
|
Elyor Djalilov
|
bb0c368931
|
unused key removed
|
2022-11-30 17:13:24 +05:00 |
|
Elyor Djalilov
|
da7996ec87
|
unused key removed
|
2022-11-30 17:11:40 +05:00 |
|
Elyor Djalilov
|
9a04949e46
|
unused key removed
|
2022-11-30 17:10:06 +05:00 |
|
Elyor Djalilov
|
e2e81cb4c4
|
unused key removed
|
2022-11-30 17:08:23 +05:00 |
|
Elyor Djalilov
|
3d80ae146e
|
unused keys removed
|
2022-11-30 17:06:15 +05:00 |
|
Elyor Djalilov
|
316fda9f42
|
unused key removed
|
2022-11-30 16:58:41 +05:00 |
|
Elyor Djalilov
|
7876d6307c
|
unused key removed
|
2022-11-30 16:56:55 +05:00 |
|
Elyor Djalilov
|
9fe512152f
|
unused key removed
|
2022-11-30 16:55:09 +05:00 |
|
Elyor Djalilov
|
fcfe1e99ef
|
unused key removed
|
2022-11-30 16:53:30 +05:00 |
|
Elyor Djalilov
|
d0bb98fe33
|
unused key removed
|
2022-11-30 16:48:35 +05:00 |
|
Akmal Isomadinov
|
e4698aad3e
|
Web:Client:Public:Locales:En:Files Added translation for context menu LinkForRoomMembers
|
2022-11-30 16:41:50 +05:00 |
|
Elyor Djalilov
|
f51be1fea9
|
unused key removed
|
2022-11-30 16:41:20 +05:00 |
|
Elyor Djalilov
|
e4571eb5ce
|
unused key removed
|
2022-11-30 16:39:30 +05:00 |
|
Elyor Djalilov
|
cb4f86cb1d
|
unused key removed
|
2022-11-30 16:29:12 +05:00 |
|
Elyor Djalilov
|
840c999137
|
unused key removed
|
2022-11-30 15:48:05 +05:00 |
|
Elyor Djalilov
|
142fbadd66
|
unused key removed
|
2022-11-30 15:45:51 +05:00 |
|
Elyor Djalilov
|
e738aac686
|
unused key removed
|
2022-11-30 15:43:52 +05:00 |
|
Elyor Djalilov
|
295777b0d9
|
unused key removed
|
2022-11-30 15:40:44 +05:00 |
|
Elyor Djalilov
|
2124a9f3ab
|
unused key removed
|
2022-11-30 15:38:24 +05:00 |
|
Elyor Djalilov
|
a0444b7eeb
|
unused key removed
|
2022-11-30 15:36:39 +05:00 |
|
Elyor Djalilov
|
796f702d1d
|
unused key removed
|
2022-11-30 15:33:52 +05:00 |
|
Elyor Djalilov
|
70404e4db2
|
unused key removed
|
2022-11-30 15:33:26 +05:00 |
|
Elyor Djalilov
|
f4e53d9cf8
|
unused key removed
|
2022-11-30 15:33:03 +05:00 |
|
Elyor Djalilov
|
4e8d62f24a
|
unused key removed
|
2022-11-30 15:31:16 +05:00 |
|
Elyor Djalilov
|
4050700819
|
unused key removed
|
2022-11-30 15:30:46 +05:00 |
|
Elyor Djalilov
|
e986d29240
|
unused key removed
|
2022-11-30 15:30:25 +05:00 |
|
Elyor Djalilov
|
5c0322fe80
|
unused key removed
|
2022-11-30 15:30:01 +05:00 |
|
Elyor Djalilov
|
08108a6afa
|
unused key removed
|
2022-11-30 15:29:38 +05:00 |
|
Elyor Djalilov
|
39930f88c6
|
unused key removed
|
2022-11-30 15:29:17 +05:00 |
|
Elyor Djalilov
|
feeebbb54a
|
unused key removed
|
2022-11-30 15:28:50 +05:00 |
|
Elyor Djalilov
|
86442a8704
|
unused key removed
|
2022-11-30 15:28:25 +05:00 |
|
Elyor Djalilov
|
1afb601f0a
|
unused key removed
|
2022-11-30 15:28:01 +05:00 |
|
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 |
|
|
|
561f4cd185
|
Web: Added new information.
|
2022-11-02 12:27:54 +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 |
|
|
|
5812562fac
|
Web: Refactoring, added content for daily feed container.
|
2022-11-01 11:57:01 +03: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 |
|
|
|
5cbc7d464c
|
Web: Added new notifications panel.
|
2022-10-31 15:44:57 +03: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 |
|
TimofeyBoyko
|
2605d6f2f5
|
Web:Client:Locales: add new translation key for 'ChangeUserTypeDialog'
|
2022-10-12 14:30:15 +05:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
TimofeyBoyko
|
7a1ddd3c20
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 14:04:42 +05:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
TimofeyBoyko
|
f91604d316
|
Merge branch 'develop' into feature/bar-quotas
|
2022-10-11 12:55:55 +05:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
TimofeyBoyko
|
fe8b7ec257
|
Web:Client: add 'DocSpaceAdmin' translation key
|
2022-10-11 12:12:38 +05:00 |
|
TimofeyBoyko
|
da14ffd656
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-11 11:52:34 +05:00 |
|
|
|
49d6884502
|
Web:Client:Add translation "SuccessfulConnectionOfAThirdParty".
|
2022-10-10 19:12:26 +03:00 |
|
|
|
b018be53f9
|
Web:Client:Add reconnect image.
|
2022-10-10 19:11:37 +03:00 |
|
|
|
2414cc030c
|
Web: Client: InvitePanel: Fixes after merge
|
2022-10-10 12:37:02 +03:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05:00 |
|
|
|
8e7bf575ed
|
Web: Fixed translation (ru).
|
2022-10-06 14:17:52 +03:00 |
|
|
|
0ba61c940b
|
Web:Client:Add translation "ThirdPartyResource".
|
2022-10-06 12:44:14 +03:00 |
|
|
|
409cdd2ebe
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-10-05 17:17:33 +03:00 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
|
ce2618fe57
|
Web:Client:Add icons for tags ThirdParty.
|
2022-10-05 14:31:05 +03:00 |
|
|
|
d3d4ff6639
|
Web: Fixed description of grace period.
|
2022-10-05 13:34:59 +03:00 |
|
|
|
a2fb5e4b36
|
Web: Changed translations for grace period.
|
2022-10-05 13:26:45 +03:00 |
|
|
|
c3c64d847c
|
Web: removed useless translations.
|
2022-10-05 11:55:15 +03:00 |
|
|
|
11479c14ba
|
Web: Added missing translations.
|
2022-10-05 11:35:40 +03:00 |
|
|
|
84c8749e4f
|
Web: Changed translations.
|
2022-10-05 10:58:10 +03:00 |
|
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
|
|
a5d3106907
|
Web: Added translation.
|
2022-10-04 16:52:43 +03:00 |
|
TimofeyBoyko
|
ae584739e8
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-04 06:58:16 +03:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
mushka
|
6ef11ff695
|
fixed spelling in FilesEmptyScreenText translation key
|
2022-10-02 03:20:29 +03:00 |
|
mushka
|
6fbac45198
|
complete overhaul of translation kets in en & ru InfoPanel locales, changed history translations
|
2022-10-02 02:24:49 +03:00 |
|
mushka
|
7ad6d99c0f
|
updated key name for InfoPanel translations
|
2022-10-02 02:24:00 +03:00 |
|
TimofeyBoyko
|
d1c77c37d0
|
Web:Client:Locales: fix translation key
|
2022-09-29 13:07:27 +03:00 |
|
TimofeyBoyko
|
c3c4316c93
|
Web:Client:Locales: add new translation keys for profile
|
2022-09-28 18:17:39 +03:00 |
|
TimofeyBoyko
|
4626fbf7a7
|
Web:Client:Locales: change translation key 'Manager' to 'Room admin
|
2022-09-27 13:12:39 +03:00 |
|
TimofeyBoyko
|
a8893025ff
|
Web:Client: add new translation keys for Main bar
|
2022-09-27 12:29:17 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
mushka
|
4627ad75a7
|
deleted unused InfoPanelHistory.json
|
2022-09-26 10:43:16 +03:00 |
|
mushka
|
da139d8bbc
|
added new tranaslation keys to InfoPanel.json
|
2022-09-26 10:40:46 +03:00 |
|
|
|
3e7661899e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
|
2022-09-24 01:51:56 +03:00 |
|
|
|
33d0c10eb3
|
Merge branch 'develop' into feature/personal-redesign-empty-screen
|
2022-09-23 16:53:50 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
|
a778e10d58
|
Web:Client:Delete old translation "MyEmptyContainerDescription".
|
2022-09-22 15:30:55 +03:00 |
|
|
|
295c39b050
|
Web:Client:Change translation "MyEmptyContainerDescription" in "PersonalEmptyContainerDescription".
|
2022-09-22 15:30:22 +03:00 |
|
|
|
fd2799163a
|
Web:Client:Add personal image.
|
2022-09-22 15:26:13 +03:00 |
|
|
|
6f1290671d
|
Web:Client:Moved the picture to the client section.
|
2022-09-22 15:24:45 +03:00 |
|
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
|
|
058d3acbd3
|
Merge branch 'develop' into feature/favorites-redesign-empty-screen
|
2022-09-21 18:15:08 +03:00 |
|
|
|
7133d20a69
|
Web:Client:Delete translation "SubheadingEmptyText".
|
2022-09-21 18:09:35 +03:00 |
|
|
|
1dfcb5f6d8
|
Web:Client:Change image favorites.
|
2022-09-21 17:34:59 +03:00 |
|
|
|
ee42f4be3a
|
Merge branch 'develop' into bugfix/trash-context-menu
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2022-09-21 17:18:42 +03:00 |
|
|
|
a642d42bcc
|
Client: fix translations
|
2022-09-21 16:16:19 +03:00 |
|
TimofeyBoyko
|
f1e6d9c8f4
|
Web:Client:Locales: add new translation keys for trash context menu
|
2022-09-21 15:58:52 +03:00 |
|
TimofeyBoyko
|
ed067146c0
|
Web:Client:Public: add new icon for restore all
|
2022-09-21 15:58:20 +03:00 |
|
|
|
79fa7815c4
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-21 14:48:28 +03:00 |
|
|
|
16feeaf988
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-21 14:00:17 +03:00 |
|
|
|
91490ae7bf
|
Merge branch 'develop' into feature/recent-redesign-empty-screen
|
2022-09-21 13:19:49 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
|
ffabcea9d6
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-21 11:07:04 +03:00 |
|
|
|
6f003a8459
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-20 21:54:33 +03:00 |
|
|
|
fd72f668ba
|
Web: added new third-party icons
|
2022-09-20 16:34:15 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
mushka
|
82471a5d2c
|
created new InfoPanelHistory json file for feed translation and added new keys
|
2022-09-20 14:09:04 +03:00 |
|
mushka
|
19cbf4bc40
|
updated russian InfoPanel translation keys
|
2022-09-20 14:08:32 +03:00 |
|
mushka
|
c42b743835
|
deleted old feed translations
|
2022-09-20 14:08:03 +03:00 |
|
|
|
fd4b664b64
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-09-20 11:29:26 +03:00 |
|
|
|
2e44136820
|
Merge branch 'feature/archived-redesign-empty-screen' into feature/recent-redesign-empty-screen
|
2022-09-20 11:06:06 +03:00 |
|
|
|
c9a0e3195c
|
Web: Added backup icon.
|
2022-09-20 10:46:41 +03:00 |
|
|
|
ead5485288
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-19 23:30:28 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
|
8f1a8deda9
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 13:48:26 +03:00 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
|
13e47e8c40
|
Web:Client:Add translation "RoomEmptyContainerDescription".
|
2022-09-19 11:32:57 +03:00 |
|
|
|
7dec07dc69
|
Web:Client:Delete old translation.
|
2022-09-19 11:28:05 +03:00 |
|
|
|
a4919f43c8
|
Web:Client:Add translation "GoToPersonal", "NoFilesHereYet", change "RecentEmptyContainerDescription".
|
2022-09-19 11:25:11 +03:00 |
|
|
|
c3680f8a4e
|
Web:Client:Delete unnecessary image.
|
2022-09-19 11:24:17 +03:00 |
|
TimofeyBoyko
|
39366b49ab
|
Web:Client:Components: add new tranlsation key for rooms emptyFilterContainer
|
2022-09-19 11:23:32 +03:00 |
|
|
|
a8111836b2
|
Web:Client:Add person image.
|
2022-09-19 11:23:32 +03:00 |
|
|
|
a077a245b5
|
Web:Client:Add image recent empty screen.
|
2022-09-19 11:23:11 +03:00 |
|
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
fb0e23b2cf
|
added some translations for history
|
2022-09-16 15:12:03 +03:00 |
|
|
|
0f45e83a41
|
Web:Client:Add translation "GoToShared".
|
2022-09-16 11:11:05 +03:00 |
|
|
|
26b07766fa
|
Web:Client:Add image folder.
|
2022-09-16 11:10:21 +03:00 |
|
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +03:00 |
|
|
|
6438bca15d
|
Web: Files: Fix translation
|
2022-09-15 20:47:04 +03:00 |
|
|
|
30618e3e22
|
Web: Files: Fix translation
|
2022-09-15 20:43:35 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
21fc46b8bc
|
Web: Removed useless translations.
|
2022-09-15 15:07:26 +03:00 |
|
|
|
aa195fe76b
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-15 14:40:00 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
TimofeyBoyko
|
8480a1f525
|
Web:Client:Home: add new translation key 'ByLastModifiedDate' for filter sort
|
2022-09-15 14:08:18 +03:00 |
|
TimofeyBoyko
|
fe98362066
|
Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified'
|
2022-09-15 14:07:02 +03:00 |
|
TimofeyBoyko
|
1ca5819e0f
|
Web:Client:Home: add new translation key 'ByCreationDate' for filter sort
|
2022-09-15 14:05:51 +03:00 |
|
TimofeyBoyko
|
977dc1f7ed
|
Web:Client: change translation key 'ByCreationDate' to 'ByCreation'
|
2022-09-15 14:02:53 +03:00 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
|
|
95de5a66c8
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-15 10:26:56 +03:00 |
|
|
|
9071278cfe
|
Web:Client:Fix translation "BreakpointWarningTextPrompt", "CompanyInfoSettingsDescription".
|
2022-09-14 18:11:00 +03:00 |
|
|
|
c0244b5400
|
Web: Added plan title from the store.
|
2022-09-14 17:17:40 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
TimofeyBoyko
|
d65255f47d
|
Web:Client:Home: chage translation key 'MasterForms' to 'FormsTemplates'
|
2022-09-14 16:31:20 +03:00 |
|
