|
|
cd7805b4ca
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-26 11:16:55 +03:00 |
|
|
|
4dec7fba2a
|
Shared:Selectors:Files: update getting SettingsStore
|
2024-02-26 11:04:32 +03:00 |
|
|
|
ba4a8318a2
|
Shared:Components:Share: add wrapper with i18n
|
2024-02-26 11:02:41 +03:00 |
|
|
|
373ccbdce8
|
Merge branch 'develop' into feature/saving-room-filter
|
2024-02-26 11:10:28 +04:00 |
|
|
|
b4987dfbc3
|
Shared: ColorTheme: fix submenu color
|
2024-02-23 14:00:27 +03:00 |
|
|
|
b149385f92
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-22 22:33:59 +04: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 |
|
|
|
713e1a2dcd
|
Shared: update react-svg version
|
2024-02-22 17:34:19 +03:00 |
|
Akmal Isomadinov
|
934ffe1fdb
|
Merge branch 'develop' into feature/rewrite-hoc
# Conflicts:
# packages/common/custom.scss
|
2024-02-22 19:28:20 +05:00 |
|
|
|
61ee3fbeef
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-22 18:01:19 +04:00 |
|
|
|
7b851cac74
|
Web: Files: added HexCode translation
|
2024-02-22 16:42:00 +03:00 |
|
|
|
b3d8fe0ffc
|
Merge pull request #273 from ONLYOFFICE/bugfix/safe-area
bugfix/safe-area
|
2024-02-22 17:31:27 +04:00 |
|
|
|
7787407d5d
|
Web:Shared:Fixed page crash when clicking on the cross of the selected tag from the hidden list of tags in the search.
|
2024-02-22 16:29:20 +03:00 |
|
|
|
cc27a946fe
|
Web:Shared:Fixed page crash when opening the list of hidden tags and clicking outside the area.
|
2024-02-22 16:15:59 +03:00 |
|
|
|
1d4c1e7965
|
Doceditor:Dialogs: fix wrong file icons
|
2024-02-22 15:40:23 +03:00 |
|
|
|
5b5c670d15
|
Web:Shared:Fixed missing search and adding a tag to search when clicking a tag from a hidden list of tags.
|
2024-02-22 15:00:38 +03:00 |
|
|
|
3ca6ceab39
|
Merge
|
2024-02-22 14:55:10 +03:00 |
|
|
|
c5fc7a6144
|
Web:Fixed lack of search by room type when clicking on a room type tag in tile view.
|
2024-02-22 14:43:27 +03:00 |
|
|
|
e82b3894d2
|
Delete useless MF
|
2024-02-22 14:23:49 +03:00 |
|
|
|
ba36156387
|
Shared:Selectors:Files: delete useless
|
2024-02-22 14:13:55 +03:00 |
|
Akmal Isomadinov
|
6258cd184d
|
Merge branch 'develop' into feature/rewrite-hoc
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
|
2024-02-22 15:53:47 +05:00 |
|
Akmal Isomadinov
|
22fed4780a
|
Merge branch 'develop' into feature/rewrite-routes
# Conflicts:
# packages/client/src/routes/portalSettings.js
|
2024-02-22 15:42:05 +05:00 |
|
|
|
28567fdad9
|
Merge branch 'bugfix/rc-2.5.0' into bugfix/safe-area
|
2024-02-22 14:18:47 +04:00 |
|
|
|
3aac4cd2fb
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-22 13:17:33 +03:00 |
|
|
|
3bda83bc41
|
Merge branch 'develop' into feature/disable-form-room
|
2024-02-22 14:00:09 +04: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 |
|
|
|
c4d69493d9
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-22 10:05:57 +03:00 |
|
|
|
75b5716dcc
|
Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager
|
2024-02-22 10:00:47 +03:00 |
|
|
|
25a416ea4e
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-02-22 00:20:28 +04: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 |
|
|
|
eacad7f98f
|
Move translation keys from GroupsSelector to Common
|
2024-02-21 16:12:14 +03:00 |
|
|
|
260c48962b
|
Shared:Components:Selector: update types
|
2024-02-21 16:07:40 +03:00 |
|
|
|
28b9fe7651
|
Shared:Components:Selector: update useEffect deps
|
2024-02-21 16:05:38 +03:00 |
|
|
|
14de1c5150
|
Web: Files: fixed SelectionArea for third-party folders
|
2024-02-21 16:05:33 +03:00 |
|
|
|
db9831dd36
|
Shared:Components:Selector: update types for work with tabs, add support multiply tabs
|
2024-02-21 15:59:43 +03:00 |
|
|
|
c49f9c02a5
|
Shared:Components:Submenu: update type activeTabId
|
2024-02-21 15:59:17 +03:00 |
|
|
|
80d788d5a2
|
Shared:Selectors:Groups: fix types
|
2024-02-21 15:58:57 +03:00 |
|
|
|
89f6a4f319
|
Shared:API: fix types for selectors
|
2024-02-21 15:58:40 +03:00 |
|
|
|
7b2f01c376
|
Merge branch 'bugfix/rc-2.5.0' into bugfix/safe-area
|
2024-02-21 14:32:25 +03:00 |
|
|
|
80645ee784
|
Web: Added greeting container.
|
2024-02-21 12:40:19 +03:00 |
|
|
|
a7ea6fc4e0
|
Shared:API:People: add groups to user types
|
2024-02-21 12:32:50 +03:00 |
|
|
|
b5098c07c9
|
Shared:Components:Filter: fix types
|
2024-02-21 12:32:33 +03:00 |
|
|
|
de84f7c1be
|
Shared:Selectors:Groups: update types
|
2024-02-21 12:27:45 +03:00 |
|
|
|
dd5d5b48c9
|
Shared:API:Groups: rewrite to typescript
|
2024-02-21 12:27:22 +03:00 |
|
|
|
50bb9d0800
|
Shared: Campaigns: add fallback for translations
|
2024-02-21 12:12:33 +03:00 |
|
Akmal Isomadinov
|
58b2bc53a5
|
Fix after merge
|
2024-02-21 11:50:44 +05:00 |
|
Akmal Isomadinov
|
c7cf081d86
|
Merge branch 'develop' into feature/rewrite-loaders
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/common/components/Loaders/index.js
# packages/shared/skeletons/settings/SettingsStorageManagementLoader.js
|
2024-02-21 11:41:47 +05:00 |
|
|
|
3fa4ecfdb7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 23:37:40 +03:00 |
|
|
|
3b9afab76d
|
Web: Added a transition to the login page if the user already exists.
|
2024-02-20 22:00:57 +03:00 |
|
|
|
1449f5ae1e
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-20 22:37:37 +04: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 |
|
|
|
dfe05b707a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-20 14:36:45 +03:00 |
|
Akmal Isomadinov
|
07d3824a8c
|
Merge branch 'develop' into feature/rewrite-loaders
# Conflicts:
# packages/client/src/components/panels/AddUsersPanel/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/NoItem/index.js
# packages/client/src/pages/Home/Section/Submenu/index.js
# packages/common/components/Loaders/InfoPanelBodyLoader/views/DetailsLoader.js
|
2024-02-20 16:25:18 +05:00 |
|
Akmal Isomadinov
|
8661c352c9
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2024-02-20 15:00:40 +05:00 |
|
|
|
98e3f814d1
|
Web: Refactoring.
|
2024-02-20 12:07:12 +03:00 |
|
|
|
1f4520c9da
|
Web: Added a block with recovery access.
|
2024-02-20 11:45:23 +03:00 |
|
|
|
3a2f64049e
|
Web: Added social buttons group.
|
2024-02-20 11:17:16 +03:00 |
|
|
|
1ac244437a
|
Merge branch 'develop' into bugfix/rc-2.5.0
# Conflicts:
# packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
|
2024-02-20 12:15:26 +04:00 |
|
|
|
6c9a2b1bf3
|
Shared: CampaignsBanner: fix data for storybook
|
2024-02-20 01:40:57 +03:00 |
|
|
|
38394be19c
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 01:35:08 +03:00 |
|
|
|
59018e46c0
|
Shared: CampaignsBanner: add text
|
2024-02-20 01:34:44 +03:00 |
|
|
|
1ac6e6e161
|
Shared: Utils: fix naming
|
2024-02-19 20:38:47 +03:00 |
|
|
|
eb9f27caf0
|
Shared: CampaignsBanner: fix naming
|
2024-02-19 20:38:31 +03:00 |
|
namushka
|
ae725495c5
|
fixed gap between InvitePanel RoleSelector and group max role warning
|
2024-02-19 14:59:13 +03:00 |
|
namushka
|
fe8ecd4b65
|
fix InsideGroup Navigation styling bug
|
2024-02-19 14:43:38 +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 |
|
|
|
aa6a5d911b
|
Merge branch 'bugfix/rc-2.5.0' into feature/tag-manager
|
2024-02-19 12:58:31 +03:00 |
|
|
|
9e5bd64a6c
|
Shared: Store: SettingsStore: Moved insertTagManager method to common utils
|
2024-02-19 12:57:40 +03:00 |
|
|
|
81ba95ef9f
|
Shared: Store: SettingsStore: Added method to insert GTM scripts
|
2024-02-19 12:26:30 +03:00 |
|
|
|
2c5c3c6e99
|
Shared: Api: Settings: Added tagManagerId for PortalSetting type
|
2024-02-19 12:25:19 +03:00 |
|
|
|
80684f33fa
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-19 11:52:55 +03:00 |
|
|
|
cdd762fbdd
|
Shared:Components:ErrorContainer: add support editor
|
2024-02-19 11:40:52 +03:00 |
|
|
|
6cbfdf9ac6
|
Shared:Selectors:Files: remove useless theme provider
|
2024-02-19 11:40:28 +03:00 |
|
|
|
d5c23e31d4
|
Web: Fixed banner.
|
2024-02-19 10:50:07 +03:00 |
|
|
|
58907d0792
|
Shared: update types
|
2024-02-19 10:35:57 +03:00 |
|
Akmal Isomadinov
|
b530def372
|
custom.scss moved from common to shared
|
2024-02-19 11:46:53 +05:00 |
|
Akmal Isomadinov
|
74da984504
|
PublicRoute Rewrite to typescript
|
2024-02-18 22:38:24 +05:00 |
|
Akmal Isomadinov
|
b79fd6d335
|
PrivateRoute Rewrite to typescript
|
2024-02-18 22:09:28 +05:00 |
|
|
|
4e1710ae02
|
Merge branch 'bugfix/rc-2.5.0' into bugfix/ios-safe-area
|
2024-02-18 06:08:13 +03:00 |
|
|
|
10aaa19817
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-18 06:08:02 +03:00 |
|
Akmal Isomadinov
|
a428975dfd
|
Tiles Rewrite to typescript
|
2024-02-17 19:51:57 +05:00 |
|
Akmal Isomadinov
|
0c52d857bf
|
TilesLoader moved from common to shared
|
2024-02-17 18:32:50 +05:00 |
|
Akmal Isomadinov
|
c8c144cb65
|
SettingsLoader Rewrite to typescript
|
2024-02-17 18:10:19 +05:00 |
|
Akmal Isomadinov
|
f5f6642647
|
SettingsLoader moved from common to shared
|
2024-02-17 17:49:11 +05:00 |
|
Akmal Isomadinov
|
6341c6aa26
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2024-02-17 17:27:27 +05:00 |
|
Akmal Isomadinov
|
72a4ea8365
|
SelectorBreadCrumbsSkeleton Rewrite to typescript
|
2024-02-17 17:26:45 +05:00 |
|
Akmal Isomadinov
|
7d63710dbe
|
SectionSubmenuSkeleton Rewrite to typescript
|
2024-02-17 16:44:40 +05:00 |
|
Akmal Isomadinov
|
4ea3d29750
|
SectionHeaderSkeleton Rewrite to typescript
|
2024-02-17 16:34:45 +05:00 |
|
Akmal Isomadinov
|
eb15ea1d4e
|
SectionHeaderLoader moved from common to shared
|
2024-02-17 16:23:46 +05:00 |
|
Akmal Isomadinov
|
8e5e439a2c
|
NotificationsLoader Rewrite to typescript
|
2024-02-17 16:19:13 +05:00 |
|
Akmal Isomadinov
|
be73d0b7dd
|
NotificationsLoader moved from common to shared
|
2024-02-17 16:12:37 +05:00 |
|
Akmal Isomadinov
|
e429108da3
|
HeaderLoader Rewrite to typescript
|
2024-02-17 16:04:16 +05:00 |
|
|
|
9151452569
|
Shared:Components:ErrorBoundary: modify for nextjs
|
2024-02-16 17:31:32 +03:00 |
|
|
|
d780557c2b
|
Web: Client: Add new empty screen image to GroupsSelector
|
2024-02-16 14:55:19 +01:00 |
|
Akmal Isomadinov
|
d8c0d165fc
|
ProfileViewLoader Rewrite to typescript and fixed import path
|
2024-02-16 18:36:14 +05:00 |
|
