|
|
941ee2dce0
|
Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
|
2024-07-30 14:03:30 +03:00 |
|
|
|
d817280f88
|
Shared: Api: Portal: Fixed getInvitationLink method
|
2024-07-30 14:00:38 +03:00 |
|
Akmal Isomadinov
|
181f311781
|
Web: Removed useless code
|
2024-07-30 13:15:05 +05:00 |
|
|
|
46063047c9
|
Client: EditGroupMembersDialog: Add infinite scroll and search from server
|
2024-07-23 12:49:08 +02:00 |
|
|
|
e82fedc10d
|
Bug 69255 - Files.Uploads. Request failed with status code 429
|
2024-07-19 15:10:45 +03:00 |
|
|
|
51a92b1309
|
Added skipRedirect for severals api.
|
2024-07-16 16:50:07 +03:00 |
|
|
|
4e358f9970
|
Shared: Added skip redirect if an error is returned when pinning a room.
|
2024-07-16 13:35:14 +03:00 |
|
|
|
18050ed193
|
Shared: Api: Oforms: Added extension for default forms filter
|
2024-07-12 14:28:35 +03:00 |
|
|
|
63bf9b3968
|
Client: fix bug 68038, corrected the logic to get the default room filter
|
2024-07-05 19:38:03 +05:00 |
|
|
|
3630399bd9
|
Merge branch 'release/v2.6.0' into feature/duplicate-room
|
2024-07-01 10:39:58 +03:00 |
|
|
|
ffdc7c94a7
|
Client: Groups: Fix wrong multiple context menu
|
2024-06-28 16:07:39 +02:00 |
|
|
|
44c6ebe5b2
|
Merge branch 'develop' into feature/duplicate-room
|
2024-06-24 15:32:24 +07:00 |
|
|
|
c788cdddae
|
Shared:Api:Files: change method name for duplication
|
2024-06-24 15:27:46 +07:00 |
|
|
|
5587c01502
|
Shared:Api:Files: add a new method for duplication
|
2024-06-24 03:23:10 +07:00 |
|
|
|
f9b9c68d1c
|
Merge pull request #487 from ONLYOFFICE/feature/history-v2
Feature/history v2
|
2024-06-20 18:58:13 +04:00 |
|
namushka
|
8bb316db55
|
Merge branch 'develop' into feature/history-v2
# Conflicts:
# packages/shared/themes/dark.ts
|
2024-06-19 13:07:06 +03:00 |
|
|
|
6f4da1ed9d
|
Client:Store:UsersStore: add abort controller
|
2024-06-18 11:55:26 +03:00 |
|
|
|
a639635c98
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/store/SettingsStore.ts
# public/locales/en/Common.json
|
2024-06-17 15:17:07 +04:00 |
|
|
|
54f2dcba99
|
Merge branch 'develop' into feature/history-v2
|
2024-06-14 15:52:10 +04:00 |
|
|
|
860ec7086e
|
Merge branch 'develop' into feature/history-v2
|
2024-06-14 15:14:11 +04:00 |
|
|
|
e02d05c43f
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 12:19:34 +04:00 |
|
|
|
5593c4b655
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 11:27:02 +04:00 |
|
|
|
600d076f5c
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-14 09:52:15 +03:00 |
|
|
|
a72616801b
|
gs
# Conflicts:
# i18next/client.babel
# packages/client/public/locales/sr-Latn-RS/SMTPSettings.json
# packages/login/public/locales/en/Login.json
# public/locales/ar-SA/Common.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 19:24:05 +04:00 |
|
|
|
e6bd7fbc63
|
Deleted useless settings parameter.
|
2024-06-13 15:04:49 +03:00 |
|
|
|
8af20b8e41
|
Shared:API:Settings: add maxUploadImageSize
|
2024-06-13 14:33:27 +03:00 |
|
|
|
83aa877b74
|
Merge branch 'develop' into feature/hcaptcha
|
2024-06-13 10:40:17 +03:00 |
|
|
|
a78086c680
|
Shared: add captchaKey and captchaType for login
|
2024-06-13 10:38:15 +03:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05:00 |
|
|
|
a3c74828b8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/MobileView.js
|
2024-06-10 23:42:36 +04:00 |
|
|
|
e2dfd760be
|
Accounts: Filter: Change filtration status to EmployeeStatus totally (+new pending)
|
2024-06-10 23:23:30 +04:00 |
|
namushka
|
d5f4c7addc
|
added new history fetch api method
|
2024-06-08 02:32:19 +03:00 |
|
|
|
0fc19070dc
|
Login: add recaptcha component
|
2024-06-06 16:12:25 +03:00 |
|
Akmal Isomadinov
|
a43d7a0500
|
Merge branch 'develop' into feature/form-room
|
2024-06-03 12:58:59 +05:00 |
|
Akmal Isomadinov
|
bf4cf3a495
|
Client: Added the creation of a room from a pdf form
|
2024-05-29 16:48:03 +05:00 |
|
|
|
de9a5124bf
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/login/src/components/LoginForm/index.tsx
# packages/shared/api/user/index.js
|
2024-05-28 18:47:54 +04:00 |
|
|
|
84e0edd5d6
|
Merge pull request #423 from ONLYOFFICE/feature/language-combobox
Feature/language combobox
|
2024-05-28 17:22:15 +04:00 |
|
|
|
ba710cf5b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-28 13:43:20 +04:00 |
|
|
|
7bae6a4b95
|
LDAP: fix settings mapping
|
2024-05-28 00:15:03 +04:00 |
|
|
|
dc0cfee0b1
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-27 21:19:46 +04:00 |
|
|
|
c39fe6c943
|
Merge branch 'develop' into feature/language-combobox
|
2024-05-27 21:10:02 +04:00 |
|
|
|
db22ee0060
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 17:32:14 +03: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 |
|
|
|
8ed897cde2
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 10:21:52 +03:00 |
|
|
|
8cda03a93f
|
Merge branch 'develop' into feature/language-combobox
|
2024-05-27 11:01:36 +04:00 |
|
|
|
8138752496
|
Merge branch 'develop' into feature/copy-folder-link
|
2024-05-24 17:40:07 +04:00 |
|
|
|
ddd7ccbd84
|
Merge branch 'develop' into feature/editor-in-same-tab
|
2024-05-24 15:06:55 +03:00 |
|
|
|
a18a99bf81
|
Fixed after merge.
|
2024-05-23 15:05:07 +03:00 |
|
|
|
594e3eba89
|
Shared:Selectors:Files: add create folder
|
2024-05-23 14:44:57 +03:00 |
|
