Commit Graph

854 Commits

Author SHA1 Message Date
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
fc31cd290b Merge branch 'develop' into feature/user-quota 2024-02-16 17:23:49 +04:00
Akmal Isomadinov
18ea6b8257 ProfileFooterLoader Rewrite to typescript 2024-02-16 18:15:18 +05:00
60fa7daddc Web: Components: fixed tag 2024-02-16 14:57:56 +03:00
612395d615 Shared: Article: fix style, delete useless 2024-02-16 14:23:21 +03:00
5726f7c9ab Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace-client into feature/user-quota
# Conflicts:
#	packages/shared/store/CurrentQuotaStore.ts
2024-02-16 13:45:01 +03:00
Akmal Isomadinov
3c88c0b9e7 PaymentsStandaloneLoader Rewrite to typescript 2024-02-16 15:43:05 +05: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
Akmal Isomadinov
30fae7f942 PaymentsLoader Rewrite to typescript 2024-02-16 15:22:22 +05:00
Akmal Isomadinov
7b4cbebf8b PaymentsLoader moved from common to shared 2024-02-16 15:09:10 +05:00
a88550a9c2 Web: Refactoring. 2024-02-16 12:32:04 +03:00
99447cfc7b Web: Added a request for all users regardless of user rights. 2024-02-16 12:15:56 +03:00
314ed6be15 Web: Refactoring. 2024-02-16 12:13:09 +03:00
ff37aa1b48 Merge branch 'develop' into bugfix/article-error 2024-02-16 12:52:29 +04:00
Akmal Isomadinov
6f786c26b6 ListLoader Rewrite to typescript 2024-02-16 13:24:52 +05:00
0e5368b03a Shared:Components:Zendesk: move zendeskAPI to separate file and rewrite to class 2024-02-16 10:43:46 +03:00
e77378ce2b Shared:Components:Article: restore article body 2024-02-16 10:43:14 +03:00
Akmal Isomadinov
2dcd92a7f7 ListLoader moved from common to shared 2024-02-16 12:39:02 +05:00
Akmal Isomadinov
11c3434c7c InfoPanelHeaderLoader Rewrite to typescript 2024-02-16 12:23:30 +05:00
Akmal Isomadinov
4c57c68f42 InfoPanelHeaderLoader moved from common to shared 2024-02-16 12:16:51 +05:00
Akmal Isomadinov
7cb8a850a3 InfoPanelViewLoader Rewrite to typescript 2024-02-16 12:10:28 +05:00
d2ff42627b Web: Client: Mobile. fixed styles audit trail and login history 2024-02-16 11:11:48 +05:00
25bc1d9fdc Merge branch 'develop' into feature/user-quota 2024-02-16 01:11:33 +04:00
cee0a24934 Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-16 01:08:46 +04:00
a1a5dd5c51 Fix Uncaught TypeError: Cannot read properties of undefined (reading 'toUnicode') 2024-02-16 01:06:04 +04:00
e170ed3091 Fix eslint warnings 2024-02-16 00:34:13 +04:00
fd86a6ffa4 Merge branch 'develop' into feature/user-quota 2024-02-15 23:26:24 +04:00
c59225610a Shared: Components: Filter: delete useless 2024-02-15 18:30:47 +03:00
f92072dad8 Web: Client: Fix flushSync error. Fix when data appears before loading skeleton 2024-02-15 16:12:12 +01:00
Akmal Isomadinov
06f20f3452 InfoPanelViewLoader moved from common to shared 2024-02-15 19:30:25 +05:00
Akmal Isomadinov
4659093b27 HistoryRowsSkeleton Rewrite to typescript 2024-02-15 18:47:14 +05:00
namushka
8cb5530457 fixed InfoPanel, Groups Table, People Table, Groups SelectionArea 2024-02-15 16:18:04 +03:00
Akmal Isomadinov
777087b83d DataReassignmentLoader Rewrite to typescript 2024-02-15 17:56:57 +05:00
17a12deedd
Merge pull request #266 from ONLYOFFICE/bugfix/article-error
Shared:Components:Article: return part of article body and delete use…
2024-02-15 16:30:07 +04:00
0987d0785f Shared:Components:Article: return part of article body and delete useless console log 2024-02-15 15:21:45 +03:00
4e14e52cfc Merge branch 'develop' into bugfix/rc-2.5.0 2024-02-15 16:05:41 +04:00
3339d7478a Shared: Components: ColorTheme: delete useless 2024-02-15 15:04:11 +03:00
Akmal Isomadinov
bbf3fbad0b Shared:Skeletons:CreateEditRoom Rewrite to typescript 2024-02-15 16:55:34 +05:00
Akmal Isomadinov
c658a28295 Shared:Skeletons:Backup:RestoreBackup Rewrite to typescript 2024-02-15 16:13:15 +05:00
4aaf55dcb0 Shared:Components:Article: add logs for detect 130 error and hide part of content 2024-02-15 14:10:48 +03:00
Akmal Isomadinov
bded21120a Shared:Skeletons:Backup:DataBackup Rewrite to typescript 2024-02-15 15:49:11 +05:00
Akmal Isomadinov
2e4f112ee2 DataBackupLoader moved from common to shared 2024-02-15 15:20:28 +05:00
Akmal Isomadinov
b409eefbbb Shared:Skeletons:Backup:AutoBackup Rewrite to typescript 2024-02-15 14:27:35 +05:00
3380ea9318 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/helpers/enums.ts
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/TableStore.js
2024-02-15 12:08:27 +03:00
Akmal Isomadinov
67a1a9ccd3 AutoBackup moved from common to shared 2024-02-15 13:56:52 +05:00
a15c8d3317 Web: Client: Fix when data appears before loading 2024-02-14 23:15:58 +01:00
b727e32ef9 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-14 23:13:25 +04:00
7e19feebc3 Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0 2024-02-14 20:09:36 +05:00
06fecd59ba Web: fixed display of user types 2024-02-14 20:09:08 +05:00
3b571030cb Shared: Utils: add getPasswordErrorMessage 2024-02-14 16:41:26 +03:00
e2521ff22a Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog 2024-02-14 17:04:15 +04:00
namushka
eadba5e683 merge origin + merge fix 2024-02-14 15:38:20 +03:00
namushka
b7a711c358 moved basic feats from feature/account-groups (groups table, inside groups table, api, stores, etc.) 2024-02-14 15:35:17 +03:00
6980f088bd Merge branch 'develop' into bugfix/my-documents-share 2024-02-14 16:29:35 +04:00
f208280cd8 Merge branch 'develop' into feature/rewrite-beta-badge 2024-02-14 16:23:25 +04:00
c5a24619dd Merge branch 'develop' into feature/rewrite-app-loader 2024-02-14 16:10:00 +04:00
c6a891b40e Merge branch 'develop' into feature/ads-banner 2024-02-14 15:05:19 +03:00
b151e17a25 Merge branch 'bugfix/rc-2.5.0' into develop 2024-02-14 15:40:16 +04:00
482cf79466 Merge branch 'develop' into feature/ads-banner 2024-02-14 14:29:59 +03:00
0d6ff55fb7 Web: Files: UploadPanel: fixed Minified React error #130 2024-02-14 14:29:03 +03:00
1f43c6de33 Shared: Utils: fix 2024-02-14 14:28:56 +03:00
405406d9e5 Merge branch 'develop' into feature/user-quota
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/routes/portalSettings.js
#	public/locales/en/Common.json
2024-02-14 14:19:11 +03:00
e909a104cb Web: ToggleButton: Refactoring. 2024-02-14 14:12:48 +03:00
425499bd97 Web: Deleted useless code. 2024-02-14 14:11:14 +03:00
Akmal Isomadinov
a00fe8cbf2 Merge branch 'develop' into feature/rewrite-recover-access-modal-dialog
# Conflicts:
#	packages/client/src/pages/PortalUnavailable/index.js
#	packages/login/src/client/components/Login.tsx
2024-02-14 16:03:20 +05:00
41711d21dd Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 13:59:55 +03:00
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +03:00
Akmal Isomadinov
e042f7c8eb Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
#	packages/client/src/components/System/index.js
2024-02-14 15:41:23 +05:00
77330d7538 Shared: add type 2024-02-14 13:38:44 +03:00
ce8b0ab388 Shared:Selectors: add files selector wrapper 2024-02-14 13:36:27 +03:00
4a4da98aab Shared: use firebase fetch intervals from config 2024-02-14 13:36:21 +03: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
82bc9edd56 Shared: fix eslint errors 2024-02-14 11:04:06 +03:00
0fbc95a2ee Shared:Components:Scrollbar: fix after merge 2024-02-14 11:02:07 +03:00
e953fc7c04 Fix after merge 2024-02-14 11:01:43 +03:00
0c652ed1e5 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 10:27:11 +03:00
76c6da472a Merge branch 'develop' into bugfix/selectors 2024-02-14 10:26:14 +03:00
Akmal Isomadinov
b8e83bb0fe Client: Fix provider order and refactoring 2024-02-14 12:21:57 +05:00
f57e3e1b96 Shared:Selectors: fix search rerender 2024-02-14 10:20:15 +03:00
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
d8c2da7abf Merge branch 'develop' into feature/rewrite-error-boundary 2024-02-14 01:21:13 +04:00
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
Akmal Isomadinov
faf3990959 Shared:Components:RecoverAccessModalDialog Rewrite and moved to shared 2024-02-14 00:39:02 +05:00
9b9b20a493 Web: Client: Add showing groups in members panel. Add members search/ 2024-02-13 18:50:56 +01:00
eaf83a10d4 Web: Client: Add inviting groups to room 2024-02-13 16:53:24 +01:00
16cc8962ee Web: Shared: Adapt tabs to selector for people/groups 2024-02-13 16:21:08 +01:00
1fe703a0c9 Web: Shared: Adapt avatar for groups 2024-02-13 16:20:57 +01:00
05739c17b3 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-13 14:49:46 +03:00
cd321af411 Fix after merge 2024-02-13 13:48:15 +03:00
6ff443de9a Merge branch 'develop' into bugfix/my-documents-share 2024-02-13 13:08:28 +03:00
Akmal Isomadinov
3cb31f417a Merge branch 'develop' into feature/rewrite-error-boundary 2024-02-13 14:28:52 +05:00
233f936876 Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors 2024-02-13 12:17:15 +03:00
Akmal Isomadinov
55adeea6c1 Merge branch 'develop' into feature/rewrite-app-loader
# Conflicts:
#	packages/client/src/pages/Sdk/index.js
2024-02-13 14:13:51 +05:00
10b382d88d Fix after merge 2024-02-13 12:11:33 +03:00
Akmal Isomadinov
f9902d95fc Shared:Components:BetaBadge Rewrite and moved to shared 2024-02-13 14:05:47 +05:00
ccce651266 Merge branch 'develop' into bugfix/selectors 2024-02-13 11:05:39 +03:00
695c899b32 Shared:Components:Share: move from client and rewrite to typescript 2024-02-13 10:10:31 +03:00
Akmal Isomadinov
2084477720 Shared:Components:MoreLoginModal Rewrite and moved to shared 2024-02-13 11:27:26 +05:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04:00
ca200878d9 Merge branch 'develop' into feature/js-sdk-presets 2024-02-12 20:21:07 +04:00
84311be611 Shared: UserStore: get user type 2024-02-12 19:01:03 +03:00