Commit Graph

1667 Commits

Author SHA1 Message Date
31e2dc32fd Merge branch 'develop' into feature/create-room-selector 2024-06-05 16:20:51 +03:00
43a2d37596 Web: Files: fixed palm cursor 2024-06-05 13:22:21 +03:00
ce9da8e898 Client: move translation key to 'Common' 2024-06-05 11:13:23 +03:00
c58d44e55e Move some translation keys to Common.json 2024-06-03 19:22:44 +03:00
4b81764d18 Merge branch 'develop' into feature/selector-input 2024-05-28 11:39:09 +04:00
db22ee0060 Merge branch 'develop' into feature/selector-input 2024-05-27 17:32:14 +03:00
1bf71d5ee2 Merge branch 'develop' into feature/new-room-icons 2024-05-27 17:12:43 +04:00
410f69e130 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-27 16:31:42 +04:00
namushka
6cec1d0111
Merge branch 'develop' into feature/new-room-icons 2024-05-27 12:04:49 +03:00
4177c53d5c Merge branch 'develop' into feature/selector-input 2024-05-27 10:57:57 +03:00
8ed897cde2 Merge branch 'develop' into feature/selector-input 2024-05-27 10:21:52 +03:00
namushka
9af68dbd94
updated icons for RoomIcon component 2024-05-24 14:02:49 +03:00
ee24512bdd Merge branch 'develop' into feature/editor-in-same-tab 2024-05-24 12:33:20 +03:00
d1061bb3ae renaming resource keys 2024-05-23 18:14:33 +03:00
d90ad9d951
Merge pull request #425 from ONLYOFFICE/feature/resources-correction
Feature/resource correction
2024-05-23 18:13:30 +04:00
c440260f71 resource correction 2024-05-22 22:54:57 +03:00
e77b80f227 Add images for selector input item 2024-05-22 17:03:58 +03:00
db58a3fee9 Web: delete openOnNewPage from config 2024-05-21 13:09:17 +03:00
881b7bad4b Translations: fix UselessTranslationKeysTest issues 2024-05-15 19:37:37 +04:00
f900585de5 Merge branch 'hotfix/v2.5.1' into develop 2024-05-15 18:36:42 +04:00
139c4e6c5f Client: SDK: Fixed open editor error if file id not set 2024-05-14 16:25:14 +03:00
69203c2c1e Fixed Bug 67961: Client: SDK: Added flexible host check for csp settings inside modal frame 2024-05-14 13:42:37 +03:00
467f53220f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 19:10:03 +04:00
1f9bc33150 Merge branch 'hotfix/v2.5.1' into feature/langs-updates_0524 2024-05-13 19:04:49 +04:00
5aee9c9982 Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 18:23:45 +04:00
bb7b865498 Web: Added si flag 2024-05-13 18:05:48 +04:00
981afb7fa2 updated si 2024-05-13 16:18:53 +03:00
b4acdd2b2f Merge branch 'hotfix/v2.5.1' into develop 2024-05-13 11:23:36 +04:00
Akmal Isomadinov
403d8bc558 Client:Components:QuickButtons Fixed bug 67799 added lock icon 2024-05-08 16:21:10 +05:00
df9ced222f Merge branch 'develop' into bugfix/form-room 2024-05-07 20:26:54 +04:00
Akmal Isomadinov
0ed0fc2e18 Client:Components:Badges Fixed translation 2024-05-07 18:39:54 +05:00
Vladimir Khvan
6c7e8caa8d Merge branch 'develop' into feature/sdk-presets 2024-05-07 15:30:30 +05:00
4f2295c2d8 Merge branch 'hotfix/v2.5.1' into develop 2024-05-03 14:51:27 +04:00
b52e7af32c Fix Bug 67813
No translation of Share panel in editor
2024-05-03 12:32:58 +03:00
ee84c16335 Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
c1269a6a60 edited zh 2024-05-02 13:45:15 +03:00
Vladimir Khvan
e4ab7e11e4 Merge branch 'develop' into feature/sdk-presets 2024-04-30 02:09:42 +05:00
21560c15cb Merge branch 'develop' into feature/images-and-thumbnails 2024-04-26 18:09:38 +04:00
fcc50d6dfc Merge branch 'hotfix/v2.5.1' into develop 2024-04-26 18:05:43 +04:00
fede13cd74 Translations: Moved "Errors:InvalidLink" to Common 2024-04-26 17:41:30 +04:00
8b4bb07568 Translations: Common: Removed old key 'SelectIMGFormat' 2024-04-26 16:42:07 +04:00
1ab2c02025 Merge branch 'develop' into feature/sdk-presets
# Conflicts:
#	public/locales/en/Common.json
2024-04-26 16:40:45 +04:00
b672eae27f Merge branch 'hotfix/v2.5.1' into develop 2024-04-26 16:06:19 +04:00
a3987703cd static: added missing default user photo images 2024-04-26 14:52:43 +03:00
798d5384ce Public: BrowserDetector: Change minimum supported safari verion to 16 2024-04-26 13:27:06 +02:00
f93e7d3ab6 Web: Config: enabled thumbnails1280x720 and imageThumbnails 2024-04-25 13:46:55 +04:00
Akmal Isomadinov
68615654b4 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
2024-04-24 14:09:05 +05:00
Vladimir Khvan
c308e5560e Web: Client: JavascriptSDK: corrected translations for fileSelector presets 2024-04-23 15:54:47 +05:00
bb0267fe55 Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
2024-04-23 10:30:01 +04:00
Akmal Isomadinov
41e70017a0 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/shared/components/empty-view/EmptyView.styled.ts
2024-04-22 19:22:51 +05:00