|
|
aae967468e
|
Merge branch 'develop' into feature/language-combobox
# Conflicts:
# packages/login/index.d.ts
# packages/login/src/client/components/Login.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/server/lib/helpers/index.ts
# packages/shared/utils/loginUtils.ts
|
2024-05-21 14:43:22 +03:00 |
|
|
|
13a2daf4c0
|
Shared: add type
|
2024-05-21 13:01:19 +03:00 |
|
|
|
c61ecb2b65
|
Shared: API: add changeOpenEditorInSameTab
|
2024-05-17 15:55:42 +03:00 |
|
|
|
fe61936b4f
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-15 19:50:28 +04:00 |
|
|
|
f900585de5
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-15 18:36:42 +04:00 |
|
|
|
08b40abd26
|
LDAP: Remove hard-code
|
2024-05-14 18:44:32 +04:00 |
|
|
|
fa9dd76fcd
|
LDAP: Added LDAP login with original password by checkbox
|
2024-05-14 15:49:55 +04:00 |
|
|
|
247cc04924
|
Fixed Bug 67937 - Files.Trash.Search. Error ‘Request failed with status code 400’ when selecting a room based on a third-party storage in the Search options panel.
|
2024-05-14 13:10:25 +03:00 |
|
|
|
f46aaa0584
|
LDAP: Added save CRON on API
|
2024-05-13 16:48:44 +04:00 |
|
|
|
c582239a8e
|
LDAP: fix data in api save
|
2024-05-07 19:42:27 +04:00 |
|
|
|
e80f2d9062
|
LDAP: Fix API saveLdapSettings
|
2024-05-07 12:08:58 +04:00 |
|
|
|
6aa6b0cfd4
|
Merge branch 'develop' into feature/ldap-settings
|
2024-05-06 20:08:13 +04:00 |
|
|
|
e1b3dff05c
|
Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
# packages/login/src/components/Login/index.tsx
|
2024-05-06 20:06:08 +04:00 |
|
|
|
9dca2aa67d
|
Fix Bug 67840
The message that room is unavailable appears for a second
|
2024-05-06 13:37:23 +03:00 |
|
|
|
c2dee92e6a
|
Merge pull request #390 from ONLYOFFICE/feature/login-nextjs
Feature/login nextjs
|
2024-05-03 19:58:01 +04:00 |
|
|
|
4e1553d9be
|
Merge branch 'develop' into feature/public-preview
|
2024-05-03 15:36:07 +04:00 |
|
|
|
6381efe2ca
|
Merge branch 'develop' into feature/login-nextjs
|
2024-05-03 00:20:34 +04:00 |
|
Vladimir Khvan
|
aa878a4d3c
|
Merge branch 'develop' into feature/connecting-storage
Conflicts:
packages/shared/api/files/index.ts
|
2024-04-30 14:38:43 +05:00 |
|
Akmal Isomadinov
|
d8f37f482d
|
Shared:Components:MediaViewer Added error handler
|
2024-04-30 12:17:52 +05:00 |
|
|
|
237bb490e8
|
Merge branch 'develop' into feature/ldap-settings
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/common/store/CurrentQuotaStore.js
# packages/shared/api/settings/index.ts
|
2024-04-27 17:24:21 +04:00 |
|
|
|
e5a031dafa
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-26 13:51:53 +03:00 |
|
Akmal Isomadinov
|
165918c051
|
Merge branch 'develop' into feature/public-preview
|
2024-04-26 12:18:11 +05:00 |
|
Akmal Isomadinov
|
78ecd38694
|
Shared:Api:Files: Added request token
|
2024-04-25 18:43:36 +05:00 |
|
|
|
fbb60df665
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-25 16:41:49 +03:00 |
|
Vladimir Khvan
|
0b349e32d7
|
Web: Client: Connecting storage: integrated connecting storages data from API
|
2024-04-25 14:06:20 +05: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 |
|
|
|
434986bb88
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-24 11:01:44 +04:00 |
|
namushka
|
fc47412b44
|
fixed trash tooltips not working with personal files
|
2024-04-23 14:49:16 +03:00 |
|
|
|
621b75bb38
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-23 12:51:03 +03: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 |
|
|
|
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 |
|
|
|
3990c6d001
|
Fix Bug 67516 - Rooms.Search.Tag. The tag is broken down character by character on the page when you select a search by tag.
|
2024-04-18 15:48:18 +04:00 |
|
|
|
d4f66f20de
|
Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
# packages/client/src/components/NavMenu/sub-components/header-unauth.js
# packages/login/src/client/components/Login.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# packages/login/src/server/lib/helpers/index.ts
# packages/shared/api/user/index.js
# packages/shared/utils/common.ts
|
2024-04-18 11:52:48 +03:00 |
|
|
|
22c73d5bfa
|
Login/Shared: Added support for changing the language when logging in via social networks.
|
2024-04-17 13:38:59 +03:00 |
|
|
|
918daa782c
|
Web: Added changing the language without reloading the page.
|
2024-04-16 16:12:02 +03:00 |
|
Akmal Isomadinov
|
c4e5b3f891
|
Doceditor:Hooks:useEditorEvents Added api method start filling
|
2024-04-12 17:12:51 +05:00 |
|
|
|
e893dd568a
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-11 11:27:37 +03:00 |
|
|
|
7206ee6205
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/store/DialogsStore.js
|
2024-04-10 20:09:16 +04:00 |
|
|
|
e998e52e49
|
Shared: API: add skip logout
|
2024-04-10 15:01:25 +03:00 |
|
|
|
f68db1622c
|
Merge branch 'develop' into refactoring/remove-personal
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/client/src/pages/About/AboutContent.js
|
2024-04-08 01:23:49 +04:00 |
|
|
|
b1e363fcbf
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
|
2024-04-08 01:20:28 +04:00 |
|
|
|
46fcdfa692
|
Fixed Bug 67287 - Roms.InviteUsers. Add the inscription Invited to the group invite selector.
|
2024-04-06 09:12:42 +03:00 |
|
|
|
820da7bb80
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/SelectedFolderStore.ts
# packages/doceditor/src/app/create/page.tsx
|
2024-04-04 11:15:24 +04:00 |
|
namushka
|
825d8626a8
|
Merge branch 'release/v2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.5.0
|
2024-04-02 13:30:47 +03:00 |
|
namushka
|
a049560a44
|
added locale-dependent guide links
|
2024-04-02 13:28:57 +03:00 |
|
Akmal Isomadinov
|
b7b9b7ea7b
|
Shared:MediaViewer Fixed Bug 67103
|
2024-04-01 17:08:02 +05:00 |
|
|
|
9c6f8d9ca4
|
Web: Login, Shared: remove personal
|
2024-03-29 16:30:58 +05:00 |
|
|
|
55d3dfb3b4
|
Merge branch 'develop' into feature/login-nextjs
|
2024-03-29 12:46:18 +03:00 |
|
|
|
7c550614fd
|
Shared: add support nextjs
|
2024-03-29 11:45:01 +03:00 |
|
|
|
09bdc7e382
|
Merge branch 'release/v2.5.0' into develop
|
2024-03-26 14:38:57 +04:00 |
|
|
|
9795e231d5
|
Merge branch 'release/v2.5.0' into feature/show-disabled-users
|
2024-03-26 13:43:38 +04:00 |
|
|
|
8666c97257
|
Fix Bug 67092
|
2024-03-26 12:10:09 +03:00 |
|
|
|
e8aef49cf6
|
Shared:API:People: add 'shared' prop to TUser
|
2024-03-26 11:34:40 +03:00 |
|
|
|
027646f8ea
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/doceditor/src/app/global-error.tsx
# packages/doceditor/src/components/Root.tsx
# packages/doceditor/src/hooks/useUpdateSearchParamId.ts
# packages/doceditor/src/utils/actions.ts
# packages/doceditor/src/utils/index.ts
|
2024-03-22 16:20:48 +04:00 |
|
|
|
c9234fec72
|
Replaced copyright start year + format
|
2024-03-21 18:09:55 +04:00 |
|
|
|
043f584109
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
|
2024-03-18 14:55:42 +04:00 |
|
|
|
11b4f67041
|
Shared: apply yarn eslint:fix
|
2024-03-18 12:54:09 +03:00 |
|
|
|
adcc11094d
|
Copyright 2024
|
2024-03-18 03:13:02 +04:00 |
|
|
|
83d90ef0f4
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/doceditor/src/app/create/page.tsx
|
2024-03-15 15:47:11 +04:00 |
|
|
|
4a1ed878e9
|
Client: Fix return to groups page after updating group from InsideGroup. Fix when data in info panel is not updated after updating group.
|
2024-03-14 21:48:05 +01:00 |
|
|
|
a9380b879e
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/GlobalEvents/CreateEvent.js
# public/locales/en/Common.json
|
2024-03-14 17:47:38 +04:00 |
|
Akmal Isomadinov
|
fe1ace1795
|
Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
# public/locales/en/Common.json
|
2024-03-13 16:38:57 +05:00 |
|
|
|
d3a9c5e1ba
|
Fix bug 66389 - Rooms.Files.VersionHistory. The date in the version history in the editor is displayed incorrectly after co-editing.
|
2024-03-12 11:32:22 +03:00 |
|
|
|
1f1f330557
|
Fix Bug 66813
|
2024-03-11 17:39:00 +03:00 |
|
|
|
59bc5c30a6
|
Merge pull request #303 from ONLYOFFICE/feature/data-migration
feature/data-migration
|
2024-03-06 21:07:37 +04:00 |
|
Akmal Isomadinov
|
fe26a57c41
|
Merge branch 'develop' into feature/redesign-form-filling-room
|
2024-03-06 16:29:27 +05:00 |
|
|
|
2c5c39114c
|
Shared: fix some typescript errors
|
2024-03-06 12:37:13 +03:00 |
|
|
|
eb28b234ff
|
Merge branch 'develop' into feature/data-migration
|
2024-03-06 12:55:29 +04:00 |
|
|
|
b0a94d1629
|
Shared: fix eslint errors and warnings
|
2024-03-06 11:45:42 +03:00 |
|
|
|
176d1c7f16
|
Merge branch 'develop' into feature/data-migration
|
2024-03-05 22:09:00 +04:00 |
|
|
|
82f32d8b0b
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/routes/portalSettings.js
# packages/client/src/store/DialogsStore.js
|
2024-03-05 20:12:08 +05:00 |
|
|
|
ee7e795b7f
|
Shared:API:Files: uncomment API method
|
2024-03-05 13:55:15 +03:00 |
|
|
|
b1d41ff86c
|
Web: Shared: Add MembersSubjectType enum. Fix bad member group view.
|
2024-03-04 16:46:28 +01:00 |
|
|
|
442df9bc65
|
Web: Client: Fix bad view of group without manager
|
2024-03-04 16:22:39 +01:00 |
|
|
|
f72d8af2b9
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/src/store/index.js
# public/locales/en/Common.json
|
2024-03-04 14:30:41 +04:00 |
|
namushka
|
63e0f8a6ec
|
updated editGroup api and EditGroupDialog
|
2024-03-01 11:57:03 +03:00 |
|
namushka
|
d4134fa09b
|
merge develop + merge fix
Conflicts:
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableContainer.js
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
|
2024-03-01 02:18:24 +03:00 |
|
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
Vladimir Khvan
|
3c5763afab
|
Web: Client: Data import: delay was added / clear request was added
|
2024-02-29 18:00:20 +05:00 |
|
|
|
95c2928f38
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/shared/components/table/sub-components/TableHeaderCell.tsx
|
2024-02-29 11:41:02 +04:00 |
|
namushka
|
2798591800
|
merge + merge fix
|
2024-02-28 13:22:28 +03:00 |
|
namushka
|
dae3fa60f7
|
added EditGroupMembersDialog
|
2024-02-28 13:11:40 +03:00 |
|
Akmal Isomadinov
|
f9472f4d9e
|
Shared:Selectors:Files:FilesSelector Fixed the folder icon and disabling folders
|
2024-02-27 16:48:07 +05:00 |
|
|
|
8aef7caf62
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-27 12:53:21 +03:00 |
|
Vladimir Khvan
|
abb8ee3464
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/People.json
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/People.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/store/index.js
packages/shared/enums/index.ts
packages/shared/themes/base.ts
packages/shared/themes/dark.ts
|
2024-02-27 14:51:49 +05:00 |
|
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
|
d812437b4a
|
Web: Shared: added filter reset when there is an error in the storage
|
2024-02-26 15:39:03 +05:00 |
|
|
|
cd7805b4ca
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-26 11:16:55 +03:00 |
|
|
|
373ccbdce8
|
Merge branch 'develop' into feature/saving-room-filter
|
2024-02-26 11:10:28 +04:00 |
|
|
|
ef9ec57576
|
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
|
2024-02-22 22:31:26 +04:00 |
|
|
|
ae1dcebff6
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-22 10:53:18 +03:00 |
|
|
|
75b5716dcc
|
Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager
|
2024-02-22 10:00:47 +03:00 |
|
|
|
eb0aed4d48
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesActionsStore.js
|
2024-02-21 20:35:05 +05:00 |
|
|
|
d1c1f810a5
|
Web: Shared: expanded the room filter so that it could be saved
|
2024-02-21 20:17:43 +05:00 |
|
|
|
560958351a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-21 16:26:10 +03:00 |
|
|
|
89f6a4f319
|
Shared:API: fix types for selectors
|
2024-02-21 15:58:40 +03:00 |
|
|
|
a7ea6fc4e0
|
Shared:API:People: add groups to user types
|
2024-02-21 12:32:50 +03:00 |
|
|
|
dd5d5b48c9
|
Shared:API:Groups: rewrite to typescript
|
2024-02-21 12:27:22 +03:00 |
|
|
|
3b9afab76d
|
Web: Added a transition to the login page if the user already exists.
|
2024-02-20 22:00:57 +03:00 |
|
|
|
1749f5a9d0
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/client/src/store/index.js
# packages/shared/api/people/filter.js
# packages/shared/enums/index.ts
|
2024-02-20 19:43:27 +03:00 |
|
