|
c9234fec72
|
Replaced copyright start year + format
|
2024-03-21 18:09:55 +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 |
|
|
2c5c39114c
|
Shared: fix some typescript errors
|
2024-03-06 12:37:13 +03:00 |
|
|
b0a94d1629
|
Shared: fix eslint errors and warnings
|
2024-03-06 11:45:42 +03:00 |
|
|
b3d082fbf3
|
Merge branch 'develop' into bugfix/public-room-media-viewer
|
2024-03-04 18:58:33 +04:00 |
|
|
3ab3ac5c33
|
Fix doceditor build
|
2024-03-04 17:39:02 +04:00 |
|
Akmal Isomadinov
|
1e0d6e89ab
|
Merge branch 'bugfix/rc-2.5.0' into bugfix/public-room-media-viewer
# Conflicts:
# packages/shared/utils/common.ts
|
2024-03-04 17:28:50 +05:00 |
|
Akmal Isomadinov
|
2a9fa214dd
|
Client:PublicRoom Fixed preview in the public room
|
2024-03-04 17:14:33 +05:00 |
|
Akmal Isomadinov
|
653ca4fb44
|
Client:PublicRoom: Fixed a redirection error when reloading a page in the media viewer
|
2024-03-04 15:18:43 +05:00 |
|
|
305630513f
|
Web: moved parseDomain to shared
|
2024-03-01 19:43:50 +05:00 |
|
|
8261228759
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:08:07 +03:00 |
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
daa1f5c95a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-29 00:05:12 +03:00 |
|
|
d109696360
|
Merge pull request #284 from ONLYOFFICE/feature/invite-page-redesign
Feature/invite page redesign
|
2024-02-28 19:44:18 +04:00 |
|
|
6cb13bd589
|
Web: moved validatePortalName to shared
|
2024-02-28 19:16:33 +05:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
a1aa83ee4a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-26 14:29:58 +03:00 |
|
|
b5f706a635
|
Web: Fixed provider titles.
|
2024-02-26 11:53:11 +03:00 |
|
|
cd7805b4ca
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-26 11:16:55 +03:00 |
|
|
ef9ec57576
|
Merge pull request #281 from ONLYOFFICE/feature/tag-manager
Feature/tag manager
|
2024-02-22 22:31:26 +04:00 |
|
|
112fdb1839
|
Merge branch 'develop' into feature/ads-banner
# Conflicts:
# packages/shared/components/article/sub-components/SubmitToFormGalleryAlert.tsx
|
2024-02-22 20:05:26 +04:00 |
|
|
3aac4cd2fb
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-22 13:17:33 +03:00 |
|
Akmal Isomadinov
|
4c11e86c37
|
Shared:Utils:Common: Disable form filling room
|
2024-02-22 13:37:23 +05: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 |
|
|
3fa4ecfdb7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 23:37:40 +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 |
|
|
38394be19c
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 01:35:08 +03:00 |
|
|
eef27ebdf9
|
Shared: AuthStore: Added insertDataLayer after login
|
2024-02-19 13:41:03 +03:00 |
|
|
d21993ac74
|
Merge branch 'bugfix/selectors' into feature/editor-nextjs
|
2024-02-19 13:00:10 +03:00 |
|
|
9e5bd64a6c
|
Shared: Store: SettingsStore: Moved insertTagManager method to common utils
|
2024-02-19 12:57:40 +03:00 |
|
|
58907d0792
|
Shared: update types
|
2024-02-19 10:35:57 +03:00 |
|
|
10aaa19817
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-18 06:08:02 +03:00 |
|
namushka
|
f39f000d01
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/panels/AddUsersPanel/index.js
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Submenu/index.js
# packages/client/src/routes/client.js
|
2024-02-16 13:40:01 +03:00 |
|
|
fd86a6ffa4
|
Merge branch 'develop' into feature/user-quota
|
2024-02-15 23:26:24 +04:00 |
|
|
06fecd59ba
|
Web: fixed display of user types
|
2024-02-14 20:09:08 +05:00 |
|
|
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 |
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
ed3ec48e2a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-12 13:38:41 +03:00 |
|
|
399d4604ea
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-12 12:39:10 +03:00 |
|
|
d9b026c166
|
Merge branch 'develop' into feature/invite-panel-input
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
# packages/client/src/components/panels/InvitePanel/sub-components/Item.js
|
2024-02-09 17:11:02 +03:00 |
|
|
ed76251daf
|
Web: Shared: Utils: moved getUserTypeLabel to utilities
|
2024-02-09 13:15:18 +05:00 |
|
|
b92f8251f4
|
Web: Files: InvitePanel: fixed user rights
|
2024-02-08 18:04:46 +03:00 |
|
|
92e2adaa2f
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-06 21:55:59 +03:00 |
|
Akmal Isomadinov
|
1b508ba243
|
Shared: fixed cyclic dependency
|
2024-02-06 20:39:15 +05:00 |
|
|
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 |
|
|
182caeaaca
|
Shared:Utils:Common: fix convert to language function
|
2024-02-05 14:53:30 +03:00 |
|
|
c9515e8fed
|
Doceditor: add support i18next
|
2024-02-02 18:41:50 +03:00 |
|
|
ebff35be27
|
Shared: fix after merge
|
2024-02-01 23:29:29 +03:00 |
|