Commit Graph

1647 Commits

Author SHA1 Message Date
f18602ac44 Merge branch 'develop' into feature/templates
# Conflicts:
#	packages/client/src/HOCs/withBadges.js
#	packages/client/src/HOCs/withQuickButtons.js
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	packages/client/src/store/ContextOptionsStore.js
2024-05-13 14:58:37 +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
c8c7d29588 Merge branch 'develop' into feature/templates
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/DialogsStore.js
#	packages/client/src/store/TableStore.js
2024-05-06 13:58:20 +03: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
4ca93f8c22 Merge branch 'develop' into feature/templates 2024-04-23 10:41:14 +03: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
Vladimir Khvan
630f9d79ad Web: CLient: JavascriptSDK: dark mode tooltips's images were added for file selector preset 2024-04-22 18:15:12 +05:00
d2733829e5 Merge branch 'release/v2.5.0' into develop 2024-04-19 19:10:43 +04:00
Akmal Isomadinov
0623e57d9e Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/index.ts
2024-04-19 16:42:10 +05:00
af7ea9116e Translations: Moved 'Reconnect' key to Common 2024-04-19 14:54:40 +04:00
5c7a15c5f8 edited zh 'people' 2024-04-19 13:12:23 +03:00
fff1f996bd edited ar 'sign up/sign in' 2024-04-19 13:08:34 +03:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
0bace3efe2 Icons:Replaced the storage management icon in the menu. 2024-04-19 12:03:40 +03:00
440d1f5aa7 Web: Files: Templates: added create-room icon 2024-04-18 13:31:06 +03:00
08f1178c3b Merge branch 'develop' into feature/templates 2024-04-18 11:32:19 +03:00
Akmal Isomadinov
4027d69236 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/actions.ts
#	public/locales/en/Common.json
2024-04-18 12:23:54 +05:00
a16f9e1c80 Fix getObjectByLocation (zoom download issue) 2024-04-17 20:10:04 +04:00
Akmal Isomadinov
abea7a8655 Client:Components:EmptyContainer Added upload action 2024-04-17 16:55:18 +05:00
Akmal Isomadinov
6f7ae7540f Client:ContextOptionsStore Added edit pdf action 2024-04-16 14:56:12 +05:00
49cb4789f9 Enabled new language sr-Latn-RS 2024-04-16 13:02:44 +04:00
a4269690d9 Merge branch 'release/v2.5.0' into develop 2024-04-15 14:53:22 +04:00
Vladimir Khvan
7c8fe22273 Web: Client: JavascriptSDK: introduced constant width and height for windowed mode 2024-04-15 14:10:41 +05:00
691e5b4021 Web: Templates: added template icons 2024-04-15 11:07:07 +03:00
ac225603c6 Web: Templates: added new translations 2024-04-15 11:06:33 +03:00
3705f67b5c Merge branch 'release/v2.5.0' into develop 2024-04-15 10:19:38 +04:00
9ff5b3c35d Public: SDK: Restored csp auto pass for same domain 2024-04-14 09:45:12 +03:00
Vladimir Khvan
459d809bad Web: Client: JavascriptSDK: fixed borders in windowed mode 2024-04-13 20:08:12 +05:00
e27bad8eae Merge branch 'release/v2.5.0' into develop 2024-04-12 20:13:01 +04:00
1f2260e5a0 Translations: Fix bad tag in keys InvitationToPortal, InvitationToRoom 2024-04-12 20:05:39 +04:00