IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,098 Commits 40 Branches 22 Tags 420 MiB
3af69819d9
Commit Graph

48 Commits

Author SHA1 Message Date
Alexey Safronov
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
Alexey Safronov
e02d05c43f Merge branch 'develop' into feature/values-renaming 2024-06-14 12:19:34 +04:00
Alexey Safronov
5593c4b655 Merge branch 'develop' into feature/values-renaming 2024-06-14 11:27:02 +04:00
Timofey Boyko
600d076f5c Merge branch 'develop' into feature/hcaptcha 2024-06-14 09:52:15 +03:00
Tatiana Lopaeva
e6bd7fbc63 Deleted useless settings parameter. 2024-06-13 15:04:49 +03:00
Timofey Boyko
8af20b8e41 Shared:API:Settings: add maxUploadImageSize 2024-06-13 14:33:27 +03:00
Timofey Boyko
0fc19070dc Login: add recaptcha component 2024-06-06 16:12:25 +03:00
Alexey Safronov
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
Alexey Safronov
7bae6a4b95 LDAP: fix settings mapping 2024-05-28 00:15:03 +04:00
Tatiana Lopaeva
a18a99bf81 Fixed after merge. 2024-05-23 15:05:07 +03:00
Tatiana Lopaeva
e5a3b7ac10 Login: Added language combobox. 2024-05-23 09:05:08 +03:00
Alexey Safronov
08b40abd26 LDAP: Remove hard-code 2024-05-14 18:44:32 +04:00
Alexey Safronov
f46aaa0584 LDAP: Added save CRON on API 2024-05-13 16:48:44 +04:00
Alexey Safronov
c582239a8e LDAP: fix data in api save 2024-05-07 19:42:27 +04:00
Alexey Safronov
e80f2d9062 LDAP: Fix API saveLdapSettings 2024-05-07 12:08:58 +04:00
Alexey Safronov
6aa6b0cfd4 Merge branch 'develop' into feature/ldap-settings 2024-05-06 20:08:13 +04:00
Alexey Safronov
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
Timofey Boyko
e893dd568a Merge branch 'develop' into feature/login-nextjs 2024-04-11 11:27:37 +03:00
DmitrySychugov
9c6f8d9ca4 Web: Login, Shared: remove personal 2024-03-29 16:30:58 +05:00
Timofey Boyko
55d3dfb3b4 Merge branch 'develop' into feature/login-nextjs 2024-03-29 12:46:18 +03:00
Timofey Boyko
7c550614fd Shared: add support nextjs 2024-03-29 11:45:01 +03:00
Viktor Fomin
8666c97257 Fix Bug 67092 2024-03-26 12:10:09 +03:00
Alexey Safronov
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
Timofey Boyko
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
Alexey Safronov
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Alexey Safronov
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
Vladimir Khvan
3c5763afab Web: Client: Data import: delay was added / clear request was added 2024-02-29 18:00:20 +05: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
Timofey Boyko
cd7805b4ca Merge branch 'develop' into feature/editor-nextjs 2024-02-26 11:16:55 +03:00
Timofey Boyko
ae1dcebff6 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-22 10:53:18 +03:00
Ilya Oleshko
75b5716dcc Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager 2024-02-22 10:00:47 +03:00
Ilya Oleshko
2c5c3c6e99 Shared: Api: Settings: Added tagManagerId for PortalSetting type 2024-02-19 12:25:19 +03:00
Vladimir Khvan
3ba7f84446 Web: Client: data import: fixed logs request 2024-02-16 16:04:29 +05:00
Tatiana Lopaeva
5b28408a17 Merge branch 'develop' into feature/user-quota 
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/SelectedFolderStore.js
#	packages/client/src/store/TableStore.js
#	packages/client/src/store/index.js
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/utils/common.ts
#	public/locales/en/Common.json
 2024-02-14 12:15:32 +03:00
Vladimir Khvan
719ffe2b60 Merge branch 'develop' into feature/data-migration 
Conflicts:
	packages/client/src/routes/portalSettings.js
	packages/client/src/store/DialogsStore.js
	packages/client/src/store/index.js
	packages/common/constants/index.js
	packages/components/file-input/index.js
	packages/components/paging/index.js
	packages/components/progress-bar/index.js
	packages/components/row/index.js
	packages/components/table-container/TableGroupMenu.js
	packages/components/themes/base.js
	packages/shared/api/settings/index.ts
	packages/shared/components/paging/Paging.styled.ts
	packages/shared/components/table/sub-components/TableHeaderCell.tsx
	packages/shared/utils/catalogIconHelper.ts
	public/locales/en/Common.json
 2024-02-13 16:16:29 +05:00
Timofey Boyko
399d4604ea Merge branch 'develop' into feature/editor-nextjs 2024-02-12 12:39:10 +03:00
Alexey Safronov
07c1d4372c
Merge pull request #212 from ONLYOFFICE/feature/rewrite-stores 
Feature/rewrite stores
 2024-02-07 18:29:30 +04:00
Viktor Fomin
7ca44dd09e Shared: API: delete useless 2024-02-07 15:52:55 +03:00
Tatiana Lopaeva
d385474caa Merge branch 'develop' into feature/user-quota 
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/GlobalEvents/CreateRoomEvent.js
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/components/MainBar/Bar.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/Filter/index.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/UsersStore.js
#	packages/client/src/store/index.js
#	packages/common/store/AuthStore.js
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/files/index.ts
#	packages/shared/api/files/types.ts
#	packages/shared/store/CurrentQuotaStore.ts
#	packages/shared/store/UserStore.ts
#	public/locales/en/Common.json
 2024-02-06 11:52:52 +03:00
Timofey Boyko
573844d77f Shared:API: fix types 2024-02-01 10:20:27 +03:00
Timofey Boyko
004818d522 Client:Store:Wizzard: rewrite to typescript 2024-01-29 16:23:37 +03:00
Timofey Boyko
6d61917078 Client:Store:Payment: rewrite to typescript 2024-01-29 14:05:12 +03:00
Tatiana Lopaeva
1a8865e9fb Web: Added quota setting for the portal. 2024-01-29 11:37:14 +03:00
Timofey Boyko
c17fd93574 Shared:Store:AuthStore: rewrite to typescript 2024-01-25 16:14:13 +03:00
Timofey Boyko
6757092523 Shared:Store:SettingsStore: move from common and rewrite to typescript 2024-01-25 11:17:19 +03:00
Timofey Boyko
b3629d1386 Shared:Store:TfaStore: move from common, rewrite to typescript and update using without auth store 2024-01-23 12:55:19 +03:00
Tatiana Lopaeva
1e0c383514 Merge branch 'develop' into feature/user-quota 
# Conflicts:
#	packages/client/src/components/GlobalEvents/EditRoomEvent.js
#	packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
#	packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
#	packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/constants/index.js
#	packages/common/store/CurrentQuotaStore.js
#	packages/components/combobox/index.js
#	packages/components/themes/base.js
#	packages/components/toggle-button/index.js
#	packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
#	packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
#	packages/shared/api/people/filter.js
#	packages/shared/api/rooms/filter.js
#	packages/shared/utils/common.ts
#	yarn.lock
 2024-01-19 11:32:34 +03:00
Timofey Boyko
7a2709b1f6 Shared:Utils:Common\Api: move from common and rewrite to typescript 2024-01-14 09:13:04 +03:00