|
|
d2d7d535d1
|
Fixed after merge.
|
2024-06-27 12:39:43 +03:00 |
|
|
|
61290de23c
|
Merge branch 'feature/VDR-room' into feature/VDR-watermarks
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/src/components/GlobalEvents/CreateRoomEvent.js
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/shared/components/image-editor/Dropzone/index.tsx
# packages/shared/components/language-combobox/LanguageCombobox.types.ts
# packages/shared/components/tabs-container/TabsContainer.styled.tsx
# packages/shared/components/tabs-container/TabsContainer.tsx
# packages/shared/enums/index.ts
# packages/shared/themes/base.ts
# packages/shared/themes/dark.ts
# packages/shared/utils/common.ts
|
2024-06-26 16:29:29 +03:00 |
|
|
|
72f7e3ea5d
|
Deleted useless code.
|
2024-06-26 16:04:12 +03:00 |
|
|
|
ea56dece9e
|
Refactoring.
|
2024-06-26 16:03:22 +03:00 |
|
|
|
3ff194fc66
|
Refactoring.
|
2024-06-26 13:32:44 +03:00 |
|
|
|
523bf28fd9
|
Refactoring.
|
2024-06-26 13:06:47 +03:00 |
|
|
|
123665d3c9
|
Added icon preview for watermark.
|
2024-06-25 17:05:06 +03:00 |
|
|
|
b73a9526d2
|
Refactoring.
|
2024-06-21 12:22:21 +03:00 |
|
|
|
33145f2a3f
|
Merge branch 'develop' into feature/VDR-room
# Conflicts:
# packages/shared/enums/index.ts
# public/locales/en/Common.json
|
2024-06-20 11:44:03 +03:00 |
|
|
|
152c124140
|
Merge pull request #506 from ONLYOFFICE/bugfix/cron
Bugfix/cron
|
2024-06-20 11:52:33 +04:00 |
|
Akmal Isomadinov
|
2e7d0904f6
|
Client:Pages:LDAP:SyncContainer Fixed import cron
|
2024-06-19 21:11:48 +05:00 |
|
|
|
a4bd4846d2
|
Merge pull request #500 from ONLYOFFICE/feature/github-develop-branch-action
Add develop branch for github action trigger
|
2024-06-19 19:45:15 +04:00 |
|
|
|
50ff20d426
|
Merge pull request #496 from ONLYOFFICE/bugfix/form-room
Bugfix/form room
|
2024-06-19 19:44:53 +04:00 |
|
|
|
bfeb8c4a36
|
Merge pull request #503 from ONLYOFFICE/feature/doceditor-internal-requests
Feature/doceditor internal requests
|
2024-06-19 19:44:21 +04:00 |
|
|
|
c651d0b0b9
|
Merge pull request #505 from ONLYOFFICE/feature/self-disabling-text-correction
Feature/self disabling text correction
|
2024-06-19 18:39:31 +04:00 |
|
|
|
37d4d254ae
|
Merge branch 'develop' into feature/self-disabling-text-correction
# Conflicts:
# i18next/client.babel
# packages/client/public/locales/en/DeleteProfileEverDialog.json
# packages/client/public/locales/en/DeleteSelfProfileDialog.json
# packages/client/public/locales/it/DeleteProfileEverDialog.json
# packages/client/public/locales/ru/DeleteProfileEverDialog.json
# packages/client/public/locales/ru/DeleteSelfProfileDialog.json
# packages/client/src/pages/Confirm/sub-components/profileRemove.js
|
2024-06-19 17:14:26 +03:00 |
|
|
|
f1bee17d27
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-19 16:34:10 +04:00 |
|
|
|
ba2228fdca
|
Update yarn to v4.3.0
|
2024-06-19 16:16:11 +04:00 |
|
|
|
675d6c86fa
|
Merge pull request #501 from ONLYOFFICE/bugfix/restore-redirect
Fix Bug 68039 - Rooms.Archive. Added redirect to archive after restore
|
2024-06-19 15:03:15 +03:00 |
|
|
|
b2c3cc422a
|
Doceditor:Utils:Actions: enable internal requests
|
2024-06-19 14:35:28 +03:00 |
|
|
|
f8b86220bc
|
Shared:Utils:NextSSRHelper: remove flag for disable internal requests
|
2024-06-19 14:35:11 +03:00 |
|
Akmal Isomadinov
|
99cd9ad8cc
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-19 15:59:19 +05:00 |
|
Akmal Isomadinov
|
bb67ec535f
|
Client: Fixed copy link system folder
|
2024-06-19 15:42:43 +05:00 |
|
Akmal Isomadinov
|
4d48d3563e
|
Public:Locales Fixed translation
|
2024-06-19 14:47:38 +05:00 |
|
Akmal Isomadinov
|
a9f38e7586
|
Client:Home:InfoPanel Added anonymous
|
2024-06-19 14:45:57 +05:00 |
|
|
|
2b45f757ec
|
edited Disabling ru
|
2024-06-19 12:40:22 +03:00 |
|
Akmal Isomadinov
|
a004e58037
|
Client:Store:FilesStore create file
|
2024-06-19 14:39:47 +05:00 |
|
Akmal Isomadinov
|
db40a5faa7
|
Client:Pages:Home:Hooks:useFiles Removed logger
|
2024-06-19 13:37:38 +05:00 |
|
Akmal Isomadinov
|
bf7bd86a52
|
Client:Store:FilesActionStore Added toast
|
2024-06-19 13:37:16 +05:00 |
|
|
|
60aa632984
|
Merge pull request #499 from ONLYOFFICE/bugfix/get-current-tab
Client/Pages/PortalSettings: remove method getCurrentTab
|
2024-06-19 10:44:57 +04:00 |
|
|
|
0c33e94559
|
Merge pull request #502 from ONLYOFFICE/feature/new-notify-templates
Feature/new notify templates
|
2024-06-18 19:46:53 +04:00 |
|
|
|
8a001cf415
|
Added new images for notifications
|
2024-06-18 18:25:18 +03:00 |
|
Akmal Isomadinov
|
b666b0db68
|
Client: Fixed create from form gallery
|
2024-06-18 17:05:20 +05:00 |
|
|
|
9e0d64c29b
|
Fix Bug 68039 - Rooms.Archive. Added redirect to archive after restore
|
2024-06-18 13:09:27 +03:00 |
|
|
|
8cd567abde
|
Merge branch 'develop' into bugfix/get-current-tab
|
2024-06-18 12:58:47 +03:00 |
|
Akmal Isomadinov
|
1b99bc534f
|
Merge branch 'develop' into bugfix/form-room
|
2024-06-18 14:44:51 +05:00 |
|
|
|
7882081632
|
Add develop branch for github action
|
2024-06-18 12:26:10 +03:00 |
|
|
|
8cc7d70f4b
|
Client: Remove console log
|
2024-06-18 12:33:09 +04:00 |
|
|
|
c135a670c1
|
Client/Pages/PortalSettings: remove method getCurrentTab
|
2024-06-18 15:24:13 +07:00 |
|
|
|
5dc1932a54
|
Components: Fix crash on create new room (static import ScrollbarContext issue)
|
2024-06-18 12:01:54 +04:00 |
|
Akmal Isomadinov
|
181f412e8c
|
Doceditor: Fixed share PDF form
|
2024-06-18 12:02:21 +05:00 |
|
Akmal Isomadinov
|
a12aa30a47
|
Client:InfoPanel:History Fixed name unknown user
|
2024-06-17 21:21:33 +05:00 |
|
|
|
35df7f00df
|
Merge pull request #144 from ONLYOFFICE/feature/ldap-settings
Feature/ldap settings
|
2024-06-17 20:16:18 +04:00 |
|
|
|
81c1015e9e
|
LDAP: Fix translation
|
2024-06-17 20:15:58 +04:00 |
|
Akmal Isomadinov
|
d9fc46fa4d
|
Client:InfoPanel:Helpers:DetailsHelper Fixed properties owner and Last modified
|
2024-06-17 21:14:14 +05:00 |
|
|
|
896a58765b
|
LDAP: Fix RTL
|
2024-06-17 20:06:45 +04:00 |
|
Akmal Isomadinov
|
6e4d29d2a8
|
Client:Form room Fixed upload
|
2024-06-17 20:30:40 +05:00 |
|
Akmal Isomadinov
|
3bd118861a
|
Client:Dialogs:ConflictResolveDialog Fixed translation name space
|
2024-06-17 20:29:24 +05:00 |
|
|
|
61306283d5
|
Merge branch 'develop' into feature/ldap-settings
|
2024-06-17 19:07:00 +04:00 |
|
|
|
04c4b2d93c
|
LDAP: Apply changes in productName
|
2024-06-17 19:06:38 +04:00 |
|
