|
cd50665338
|
Web: Components: Table: fixed text styles
|
2024-03-06 16:24:25 +03:00 |
|
Vladimir Khvan
|
2ca01e4770
|
Web: Client: JavascriptSDK: preview empty screen background was changed
|
2024-03-06 16:07:42 +05:00 |
|
|
5c00cf3939
|
Shared: Errors: fix style
|
2024-03-06 13:59:00 +03:00 |
|
|
de49f1f378
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-06 12:37:19 +03:00 |
|
|
2c5c39114c
|
Shared: fix some typescript errors
|
2024-03-06 12:37:13 +03:00 |
|
|
938de1e36e
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-06 12:01:10 +03:00 |
|
|
5f84035b79
|
Web: Fixed display of the provider icon in the public room.
|
2024-03-06 12:00:48 +03:00 |
|
|
eb28b234ff
|
Merge branch 'develop' into feature/data-migration
|
2024-03-06 12:55:29 +04:00 |
|
|
34d64ebde1
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-06 11:53:19 +03:00 |
|
|
7e0e9a14d9
|
Fix item is not defined
|
2024-03-06 12:49:51 +04:00 |
|
|
b0a94d1629
|
Shared: fix eslint errors and warnings
|
2024-03-06 11:45:42 +03:00 |
|
|
8ce74c371a
|
Web: Client: Data import fixed styles
|
2024-03-06 12:56:30 +05:00 |
|
|
7ae9ddc74a
|
Shared:Components:ContextMenuButton: fix label
|
2024-03-06 10:37:46 +03:00 |
|
|
c2e77f8d77
|
Fix NotTranslatedPropsTest issues
|
2024-03-06 02:49:56 +04:00 |
|
|
a1c8069301
|
Fix NotFoundKeysTest issues
|
2024-03-06 02:23:47 +04:00 |
|
|
176d1c7f16
|
Merge branch 'develop' into feature/data-migration
|
2024-03-05 22:09:00 +04:00 |
|
Akmal Isomadinov
|
4c1cf0ce72
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-05 20:39:15 +05:00 |
|
Akmal Isomadinov
|
5d97e2d3f4
|
Shared:Components:MediaViewer Fixed title
|
2024-03-05 20:39:07 +05:00 |
|
|
44e0d016d2
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-05 18:34:04 +03:00 |
|
|
7d6df049d8
|
Web:Shared:Fixed showing a skeleton instead of a link when quickly adding links. Added waiting for a link to be received before creating a new one, so that the isLoaded state is not saved instead of the link.
|
2024-03-05 18:33:58 +03: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 |
|
|
5eee8667b6
|
Web: Components: Avatar: fixed roleIcon
|
2024-03-05 17:56:05 +03:00 |
|
|
3f6ed2e68e
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-05 16:37:24 +05:00 |
|
|
375cac4488
|
Web: Shared: Enums: corrected dropbox names
|
2024-03-05 16:37:12 +05:00 |
|
|
58dc881e80
|
Shared: Fix info panel border color in dark theme
|
2024-03-05 12:22:03 +01:00 |
|
|
bcf3b66856
|
Shared: Share: fix
|
2024-03-05 14:19:43 +03:00 |
|
|
ee7e795b7f
|
Shared:API:Files: uncomment API method
|
2024-03-05 13:55:15 +03:00 |
|
|
84fc187a27
|
Merge branch 'develop' into feature/groups
|
2024-03-04 21:55:21 +04:00 |
|
|
a8c0fd36b1
|
Merge branch 'develop' into bugfix/sdk-presets
|
2024-03-04 20:57:09 +04:00 |
|
Vladimir Khvan
|
f5e4f141ae
|
Web: Client: JavascriptSDK: isDocument icon prop was added to FileInput
|
2024-03-04 20:57:50 +05:00 |
|
|
b1d41ff86c
|
Web: Shared: Add MembersSubjectType enum. Fix bad member group view.
|
2024-03-04 16:46:28 +01:00 |
|
|
6fbd77e294
|
Web: Shared: Components: DropDownItem fixed closed after selection element
|
2024-03-04 20:41:35 +05:00 |
|
|
442df9bc65
|
Web: Client: Fix bad view of group without manager
|
2024-03-04 16:22:39 +01:00 |
|
|
c9c1f9e0e4
|
Merge branch 'develop' into feature/groups
|
2024-03-04 19:05:50 +04:00 |
|
|
b3d082fbf3
|
Merge branch 'develop' into bugfix/public-room-media-viewer
|
2024-03-04 18:58:33 +04:00 |
|
|
6458ed9c26
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/Groups/TableView/GroupsTableItem.js
# packages/client/src/store/GroupsStore.ts
|
2024-03-04 18:52:18 +04:00 |
|
|
c5bad55f97
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-04 17:41:55 +04:00 |
|
|
3ab3ac5c33
|
Fix doceditor build
|
2024-03-04 17:39:02 +04:00 |
|
|
77b5986876
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/routes/client.js
# packages/client/src/routes/confirm.js
# packages/client/src/routes/general.js
# packages/client/src/routes/portalSettings.js
# packages/common/package.json
# packages/components/scrollbar/styled-scrollbar.js
# packages/editor/package.json
# packages/shared/package.json
# packages/shared/utils/component-loader.ts
|
2024-03-04 17:38:42 +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
|
cd0f3c10bf
|
Client:PublicRoom Refactoring
|
2024-03-04 17:22:54 +05:00 |
|
Akmal Isomadinov
|
2a9fa214dd
|
Client:PublicRoom Fixed preview in the public room
|
2024-03-04 17:14:33 +05:00 |
|
|
f3ba2cb7c0
|
Web: Shared: Components: Progressbar. added "isInfiniteProgress" prop
|
2024-03-04 16:16:51 +05:00 |
|
|
b6719c3c91
|
Merge branch 'bugfix/rc-2.5.0' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-04 14:03:38 +03:00 |
|
|
320a7b0061
|
Web:Shared:Added stop of filling the progress of the operation and transition to infinity when the API incorrectly returns progress greater than 100.
|
2024-03-04 14:03:32 +03:00 |
|
|
f9f2105d77
|
Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0
|
2024-03-04 13:59:16 +03:00 |
|
|
f5c7247587
|
Web: Components: fixed MainButtonMobile
|
2024-03-04 13:59:09 +03: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 |
|
|
3004623307
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into feature/dns-validation
|
2024-03-04 15:27:28 +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 |
|
Vladimir Khvan
|
4083b13f76
|
Web: Client: JavascriptSDK: title was added to selected item
|
2024-03-04 12:40:42 +05:00 |
|
|
63540ab04f
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-04 11:32:47 +04:00 |
|
|
138c73486b
|
Client:Shared:Article: fix logo styles
|
2024-03-04 10:05:56 +03:00 |
|
Akmal Isomadinov
|
b342219053
|
Client:Routes: Added public route media viewer
|
2024-03-03 18:08:20 +05:00 |
|
|
98736d1273
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2024-03-01 20:18:53 +05:00 |
|
|
3db9d5de15
|
Merge pull request #293 from ONLYOFFICE/bugfix/table-info-panel
Web: Components: fixed table resizing when info-panel is open
|
2024-03-01 18:01:52 +03:00 |
|
|
305630513f
|
Web: moved parseDomain to shared
|
2024-03-01 19:43:50 +05:00 |
|
|
1406d3fb87
|
Added x-forwarded-port (docker on another port issue)
|
2024-03-01 17:50:31 +04:00 |
|
|
55f206700e
|
Web: Components: fixed table resizing when info-panel is open
|
2024-03-01 15:55:08 +03:00 |
|
|
107678b093
|
Shared: Article: Apps: support language in url
|
2024-03-01 14:02:27 +03:00 |
|
|
718455ee09
|
Web: added xlsb icons
|
2024-03-01 15:37:04 +05:00 |
|
|
ab454da48e
|
Merge branch 'develop' into feature/groups
|
2024-03-01 11:31:28 +01:00 |
|
|
3938bd7859
|
Web: Components: Table: fixed crash
|
2024-03-01 13:16:19 +03:00 |
|
namushka
|
63e0f8a6ec
|
updated editGroup api and EditGroupDialog
|
2024-03-01 11:57:03 +03:00 |
|
|
b4c3566e12
|
Shared: CampaignsBanner: add type
|
2024-03-01 02:39:57 +03:00 |
|
|
f960893622
|
Shared: CampaignsBanner: add rtl support
|
2024-03-01 02:35:55 +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 |
|
|
8261228759
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:08:07 +03:00 |
|
|
321bf06fb4
|
Shared:Components:Share: fix combobox styles after merge
|
2024-02-29 18:03:31 +03:00 |
|
|
40a8db9d4c
|
Merge branch 'develop' into feature/editor-nextjs
|
2024-02-29 18:00:55 +03:00 |
|
|
6152d587c6
|
Merge pull request #264 from ONLYOFFICE/feature/ads-banner
feature/ads-banner
|
2024-02-29 18:24:57 +04:00 |
|
|
947df5b013
|
Web: Client: Fix group combobox colors
|
2024-02-29 15:14:04 +01:00 |
|
Vladimir Khvan
|
3c5763afab
|
Web: Client: Data import: delay was added / clear request was added
|
2024-02-29 18:00:20 +05:00 |
|
|
f34abb8403
|
Revert container to media
|
2024-02-29 14:13:18 +03:00 |
|
namushka
|
0d1ccf3115
|
Merge branch 'feature/groups' of https://github.com/ONLYOFFICE/DocSpace-client into feature/groups
|
2024-02-29 11:48:17 +03:00 |
|
namushka
|
89235ef2d2
|
refactor EditGroupMembersDialog
|
2024-02-29 11:48:14 +03: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 |
|
|
f9b0599a07
|
Merge branch 'bugfix/rc-2.5.0' into develop
|
2024-02-29 11:04:48 +04:00 |
|
|
213a4e3ff4
|
Shared: CampaignsBanner: refactoring
|
2024-02-29 00:35:36 +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 |
|
|
5c6b61d71a
|
Merge pull request #288 from ONLYOFFICE/feature/portal-name-validation
Feature/portal name validation
|
2024-02-28 18:23:57 +04:00 |
|
|
6cb13bd589
|
Web: moved validatePortalName to shared
|
2024-02-28 19:16:33 +05:00 |
|
|
b59dd58a82
|
Merge remote-tracking branch 'origin/feature/groups' into feature/groups
|
2024-02-28 15:09:25 +01:00 |
|
|
33cbd3b0c4
|
Web: Files: TableHeader: fixed minWidth
|
2024-02-28 16:49:37 +03:00 |
|
|
caee3ecc8d
|
Web: Shared: Fix bug when dir="auto" affects margin/padding/flex styles on text element
|
2024-02-28 12:28:48 +01:00 |
|
|
091cec6f25
|
Shared: Utils: CrashReport: add error url
|
2024-02-28 13:28:04 +03: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 |
|
|
7584ba0eae
|
Shared: Utils: CrashReport: add device info
|
2024-02-28 12:58:21 +03:00 |
|
|
0799361e02
|
Shared: CampaignsBanner: disable rtl
|
2024-02-27 19:22:45 +03:00 |
|
|
acc19b269c
|
Merge branch 'develop' into feature/groups
# Conflicts:
# packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
|
2024-02-27 16:32:55 +01:00 |
|
|
1f80f10660
|
Web: Shared: Fix plus badge margin
|
2024-02-27 15:47:47 +01:00 |
|
|
206f429c92
|
Web: MoreLoginModal: Fixed styles for sso.
|
2024-02-27 17:06:23 +03:00 |
|
|
da494e8aa3
|
Shared: CampaignsBanner: fix style
|
2024-02-27 13:23:45 +03: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 |
|
|
eebbb68734
|
Doceditor: fix iphone problems
|
2024-02-27 12:49:11 +03:00 |
|
|
06b54a3bf9
|
Web: Shared: fixed trimSeparator
|
2024-02-27 12:23:19 +03:00 |
|
|
e5e3c72ac5
|
Update firebase version
|
2024-02-27 12:03:13 +03:00 |
|
|
eb127578b2
|
Merge branch 'feature/invite-page-redesign' of https://github.com/ONLYOFFICE/DocSpace-client into feature/invite-page-redesign
# Conflicts:
# public/locales/en/Common.json
|
2024-02-27 11:47:46 +03:00 |
|
|
ca22a25f39
|
Web: Login: Fixed input focus.
|
2024-02-27 11:45:08 +03:00 |
|
|
31c6b2b1ad
|
Web: Client: Fixed the button for changing user type in the group menu does not work
|
2024-02-27 13:27:36 +05:00 |
|
|
0fcda1213f
|
Shared: CampaignsBanner: fix
|
2024-02-27 11:04:31 +03:00 |
|
|
95c2c6d455
|
Shared:Components:AppLoader: fix styles
|
2024-02-27 10:30:46 +03:00 |
|
|
6ff44125b7
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-27 09:26:24 +03:00 |
|
|
8df0a29166
|
Web: Shared: Added translation.
|
2024-02-27 09:16:55 +03:00 |
|
|
bda5be229b
|
Web: Fixed display of the number of providers.
|
2024-02-27 09:13:44 +03:00 |
|
|
b4b679a8f1
|
Web: Client: Reset group combobox colors. Add dark theme
|
2024-02-26 18:32:05 +01:00 |
|
|
15ddf95e3b
|
Merge branch 'develop' into feature/invite-page-redesign
|
2024-02-26 20:49:56 +04:00 |
|
|
9e8f3caa16
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-02-26 20:48:53 +04:00 |
|
|
a21a415cb8
|
Shared: CampaignsBanner: fix style, add fit text
|
2024-02-26 18:34:31 +03:00 |
|
|
c4b510978f
|
Web: Client: Shared: Add dark theme to members search
|
2024-02-26 15:41:02 +01:00 |
|
|
8ebc0fb6fa
|
Web: Added scroll.
|
2024-02-26 17:11:33 +03:00 |
|
namushka
|
8a53c9229d
|
brought back plus badge to Group column in Accounts/People, now as a ComboBox prop
|
2024-02-26 15:26:58 +03:00 |
|
|
744b35297a
|
Shared:Components:Toast: fix types
|
2024-02-26 15:13:21 +03:00 |
|
|
4a4434b05a
|
Shared:Utils:Firebase: fix SSR
|
2024-02-26 14:40:54 +03:00 |
|
|
d577bce803
|
Shared:Components: fix default props
|
2024-02-26 14:40:29 +03:00 |
|
|
a1aa83ee4a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-26 14:29:58 +03:00 |
|
|
9701f3b85f
|
Web: Removed warnings.
|
2024-02-26 14:02:01 +03:00 |
|
|
983d773f28
|
Web: Fixed styles.
|
2024-02-26 13:49:44 +03:00 |
|
|
dedfdc07b2
|
Web: Fixed styles.
|
2024-02-26 13:44:33 +03:00 |
|
|
d812437b4a
|
Web: Shared: added filter reset when there is an error in the storage
|
2024-02-26 15:39:03 +05:00 |
|
|
5263983b56
|
Web: Shared: Components: ImageEditor: fixed blur in the preview when the screen is enlarged
|
2024-02-26 15:15:13 +05:00 |
|
|
412765e3af
|
Web: Icon added, styles corrected.
|
2024-02-26 12:49:37 +03:00 |
|
|
11da227257
|
Fix translation issues
|
2024-02-26 12:06:12 +03:00 |
|
|
c9022a07c0
|
Web: Fixed styles.
|
2024-02-26 11:58:24 +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 |
|
|
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 |
|
|
0aa90a614b
|
Web: Client: Shared: Add dark theme to accounts
|
2024-02-22 22:25:24 +01: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 |
|
|
45dfb67961
|
Web: Shared: Set type for theme interfaceDirection. Move TInterfaceDirection to avoid cycle import.
|
2024-02-22 15:34:42 +01: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 |
|
|
039a66ec75
|
Web: Client: Shared: Add rtl to accounts. Fix when line height cuts increased rtl text
|
2024-02-21 16:41:16 +01: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 |
|
Vladimir Khvan
|
446be44db4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
public/locales/en/Common.json
|
2024-02-20 14:03:51 +05: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 |
|