|
|
91d034a385
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-07 12:05:06 +04:00 |
|
|
|
b10b85e8ab
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
|
2024-06-06 23:14:40 +04:00 |
|
|
|
e3575a111b
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-06 22:52:10 +04:00 |
|
Akmal Isomadinov
|
2a52259060
|
Merge branch 'develop' into feature/form-room
|
2024-06-06 17:16:16 +05:00 |
|
|
|
aa588ddf7f
|
Merge branch 'develop' into feature/embedding-settings
|
2024-06-06 11:56:58 +04:00 |
|
|
|
ed70df3c23
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-06 11:52:47 +04:00 |
|
|
|
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 |
|
|
|
a81baf7e74
|
added sr-cyrl
|
2024-06-04 15:29:57 +03:00 |
|
|
|
c58d44e55e
|
Move some translation keys to Common.json
|
2024-06-03 19:22:44 +03:00 |
|
Akmal Isomadinov
|
70c3a24e4f
|
Doceditor: Added CompletedForm page
|
2024-05-31 21:34:29 +05:00 |
|
|
|
8a8ed799fb
|
Client: added translation
|
2024-05-31 15:48:36 +05:00 |
|
|
|
2779f4c0b8
|
Web: Files: added document embedding
|
2024-05-30 18:35:14 +03:00 |
|
|
|
7f8b7ddc4f
|
Fixed translations.
|
2024-05-30 17:42:40 +03:00 |
|
|
|
3e942791be
|
Added interpolation for 'SpaceUsersOnly' key.
|
2024-05-30 17:40:29 +03:00 |
|
|
|
f238741429
|
Fixed translation.
|
2024-05-30 17:37:21 +03:00 |
|
|
|
4d3e61b703
|
Added interpolation for 'SelectFromDocspace' key.
|
2024-05-30 16:40:55 +03:00 |
|
|
|
7fd2cad5ee
|
Added interpolation for 'FromDocspace' key.
|
2024-05-30 16:39:22 +03:00 |
|
|
|
364c25a813
|
Added interpolation for 'BetaBadgeDescription' key.
|
2024-05-30 16:36:00 +03:00 |
|
Akmal Isomadinov
|
6a9410379d
|
Client:Dialogs:CreatedPDFFormDialog Added actions and update icons
|
2024-05-30 18:14:00 +05:00 |
|
Akmal Isomadinov
|
fb77fa76da
|
Client:EmptyView Added folder empty screen
|
2024-05-30 17:01:20 +05:00 |
|
|
|
1809b8cd92
|
Added interpolation for 'TurnOffDiskSpaceLimit key.
|
2024-05-30 14:57:14 +03:00 |
|
|
|
3313d4f020
|
Added interpolation for 'SetDiskSpaceQuota' key.
|
2024-05-30 14:54:02 +03:00 |
|
|
|
c02cc44108
|
Added interpolation for 'PortalRestriction' key.
|
2024-05-30 14:48:46 +03:00 |
|
|
|
ab7d326315
|
Added interpolation for 'InvitationToPortal' key.
|
2024-05-30 14:39:57 +03:00 |
|
|
|
706d28344b
|
Added interpolation for 'ErrorDeactivatedText' key.
|
2024-05-30 14:30:22 +03:00 |
|
|
|
53529ce19a
|
Added interpolation for 'EmptyDescription' key.
|
2024-05-30 14:04:56 +03:00 |
|
|
|
8c7bd1a241
|
Added interpolation for 'DocspaceOwner' key.
|
2024-05-30 13:27:15 +03:00 |
|
|
|
c0ee32f303
|
Added interpolation for 'DocspaceAdmin' key.
|
2024-05-30 13:13:43 +03:00 |
|
Akmal Isomadinov
|
def84f02a4
|
Client:Public:Image:EmptyView Fixed empty images
|
2024-05-29 22:56:08 +05:00 |
|
Akmal Isomadinov
|
4725272d39
|
Merge branch 'feature/form-room-new-icons' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.tsx
# packages/shared/components/empty-view/EmptyView.styled.ts
# public/images/emptyview/upload.device.pdf.form.svg
# public/images/emptyview/upload.pdf.form.svg
|
2024-05-29 21:14:25 +05:00 |
|
|
|
7d8cb75c93
|
Web: Files: EmbeddingPanel: fixed icon, added bar
|
2024-05-29 17:56:28 +03:00 |
|
|
|
0ca78803ab
|
added sr-Cyrl
|
2024-05-29 15:18:22 +03:00 |
|
|
|
99f1b8375e
|
i18next: apply sorting of keys
|
2024-05-29 13:39:15 +04:00 |
|
|
|
12d8e073c2
|
Translations: Moved Authentication key to Common
|
2024-05-29 12:49:21 +04:00 |
|
|
|
49d9c7c3d9
|
Merge branch 'develop' into feature/VDR-indexing
# Conflicts:
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
|
2024-05-29 13:32:12 +05:00 |
|
|
|
377779d9d3
|
Merge remote-tracking branch 'remotes/origin/feature/VDR-room' into feature/VDR-indexing
# Conflicts:
# packages/client/src/HOCs/withQuickButtons.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/TableStore.js
# packages/client/src/store/index.js
# packages/shared/api/files/index.ts
# packages/shared/enums/index.ts
# public/locales/en/Common.json
|
2024-05-29 13:29:15 +05:00 |
|
Akmal Isomadinov
|
af4a9196e6
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/store/ContextOptionsStore.js
|
2024-05-28 17:39:01 +05:00 |
|
|
|
ba710cf5b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-28 13:43:20 +04:00 |
|
|
|
4b81764d18
|
Merge branch 'develop' into feature/selector-input
|
2024-05-28 11:39:09 +04:00 |
|
Akmal Isomadinov
|
10231dee4c
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-05-28 11:07:30 +05:00 |
|
|
|
dc0cfee0b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 21:19:46 +04:00 |
|
Akmal Isomadinov
|
28dae97d48
|
Client:Components:EmptyContainer: Added share option
|
2024-05-27 21:59:35 +05:00 |
|
|
|
db22ee0060
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 17:32:14 +03:00 |
|
Akmal Isomadinov
|
5b32ed6d88
|
Client: Fix translation
|
2024-05-27 18:36:45 +05: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 |
|
|
|
da064a698f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 16:23:36 +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 |
|
Akmal Isomadinov
|
ad48bac511
|
Client:Components:MainButton Added new actions
|
2024-05-24 20:12:47 +05:00 |
|
|
|
f441cd4546
|
Merge branch 'develop' into feature/VDR-room
|
2024-05-24 17:03:07 +03:00 |
|
namushka
|
9af68dbd94
|
updated icons for RoomIcon component
|
2024-05-24 14:02:49 +03:00 |
|
Akmal Isomadinov
|
0c15e805ae
|
Merge branch 'develop' into feature/form-room-new-icons
|
2024-05-24 15:14:37 +05: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 |
|
Akmal Isomadinov
|
debee1490b
|
Public:images:EmptyView Fixed color
|
2024-05-22 20:43:01 +05:00 |
|
|
|
e77b80f227
|
Add images for selector input item
|
2024-05-22 17:03:58 +03:00 |
|
Akmal Isomadinov
|
e754d7c069
|
Public:Image:EmptyView Added new icons
|
2024-05-22 17:34:32 +05:00 |
|
|
|
db58a3fee9
|
Web: delete openOnNewPage from config
|
2024-05-21 13:09:17 +03:00 |
|
|
|
a3c9c55ad4
|
Merge branch 'develop' into feature/VDR-room
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
|
2024-05-21 12:55:23 +03:00 |
|
|
|
1f169880e8
|
LDAP: Added badge LDAP
|
2024-05-21 10:34:59 +04:00 |
|
Akmal Isomadinov
|
d2f91f35e6
|
Merge branch 'develop' into feature/form-room-new-icons
|
2024-05-17 17:25:17 +05: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 |
|
Akmal Isomadinov
|
ab24b2ff79
|
Public:images:EmptyView Added new icons
|
2024-05-14 20:07:40 +05: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 |
|
Akmal Isomadinov
|
bdca686c83
|
Public:images:EmptyView Fixed typo
|
2024-05-14 13:15:09 +05:00 |
|
Akmal Isomadinov
|
5f4a0e142a
|
Public:images:EmptyView Added new default icons
|
2024-05-13 21:08:24 +05: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 |
|
|
|
06fee9c6b4
|
Public: Locales: added en translations for indexing
|
2024-04-26 16:02:27 +05:00 |
|
|
|
e917242293
|
Public: added svg for indexing
|
2024-04-26 15:55:17 +05:00 |
|
|
|
f93e7d3ab6
|
Web: Config: enabled thumbnails1280x720 and imageThumbnails
|
2024-04-25 13:46:55 +04:00 |
|
