|
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 |
|
|
828e159767
|
Merge branch 'develop' into bugfix/rc-2.5.0
|
2024-03-01 11:52:08 +04: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 |
|
|
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 |
|
|
55d54d63b2
|
updated it, hy
|
2024-02-29 15:22:55 +03:00 |
|
Vladimir Khvan
|
800a2945f6
|
Web: Client: JavascriptSDK: presets images were changed
|
2024-02-29 13:48:03 +05: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 |
|
|
daa1f5c95a
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-29 00:05:12 +03:00 |
|
|
763870416c
|
updated translations
|
2024-02-28 19:18:54 +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 |
|
|
852c960163
|
Move some translation keys to Common
|
2024-02-27 15:24:17 +04: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
bfc6767c02
|
renamed form gallery error image
|
2024-02-26 20:24:30 +05:00 |
|
|
7392fc08cd
|
added custom error images
|
2024-02-26 20:20:14 +05:00 |
|
|
a77a82f2b2
|
updated zh
|
2024-02-26 13:45:31 +03: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 |
|
|
b5f706a635
|
Web: Fixed provider titles.
|
2024-02-26 11:53:11 +03: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 |
|
|
3890aa323a
|
edited es
|
2024-02-22 16:49:14 +03:00 |
|
|
e9d13a6452
|
Applied babelEdit auto-fixes
|
2024-02-22 13:22:16 +04:00 |
|
|
5f744636a5
|
Translations: move Files:CreateAndCopy to Common
|
2024-02-22 13:17:26 +04:00 |
|
|
c4d69493d9
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-22 10:05:57 +03:00 |
|
|
ef3b07707a
|
edited fr
|
2024-02-21 18:19:59 +03: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 |
|
|
80645ee784
|
Web: Added greeting container.
|
2024-02-21 12:40:19 +03:00 |
|
|
6afe75a43e
|
Web: fix default campaigns list
|
2024-02-21 12:13:09 +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 |
|
|
dfe05b707a
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-20 14:36:45 +03:00 |
|
namushka
|
ac6e8192ac
|
Merge branch 'feature/groups' of https://github.com/ONLYOFFICE/DocSpace-client into feature/groups
|
2024-02-20 12:55:55 +03:00 |
|
namushka
|
fdac12fc8b
|
fixed icons
|
2024-02-20 12:48:58 +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 |
|
|
38394be19c
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-20 01:35:08 +03:00 |
|
|
5752c6a0b6
|
Fix groups translations
|
2024-02-20 00:30:49 +04:00 |
|
namushka
|
b672c0579c
|
translations update 2 + fixed insideGroup Department column
|
2024-02-19 17:41:44 +03:00 |
|
namushka
|
d796213a67
|
Translations update
|
2024-02-19 16:05:06 +03:00 |
|
Vladimir Khvan
|
2bb8ef1d49
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/src/components/dialogs/index.js
packages/client/src/routes/portalSettings.js
|
2024-02-19 14:28:07 +05:00 |
|
|
80684f33fa
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-19 11:52:55 +03:00 |
|
|
d780557c2b
|
Web: Client: Add new empty screen image to GroupsSelector
|
2024-02-16 14:55:19 +01: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 |
|
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 |
|
|
482cf79466
|
Merge branch 'develop' into feature/ads-banner
|
2024-02-14 14:29:59 +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 |
|
|
d47aa36c85
|
Merge branch 'develop' into bugfix/selectors
|
2024-02-14 13:57:36 +03:00 |
|
|
c01f777f3e
|
Web: add campaigns
|
2024-02-14 13:39:06 +03:00 |
|
|
8a3f4694f2
|
Web: add firebase fetch intervals
|
2024-02-14 13:36:38 +03:00 |
|
|
3dc49cf352
|
Auto-refactoring of translations
|
2024-02-14 13:16:02 +04: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 |
|
|
20887d0f4b
|
Move some error translation keys to common
|
2024-02-14 02:27:50 +04:00 |
|
|
904d828732
|
Web: Client: Add filters to People, Groups, InsideGroup (Accounts)
|
2024-02-13 21:48:47 +01:00 |
|
|
eaf83a10d4
|
Web: Client: Add inviting groups to room
|
2024-02-13 16:53:24 +01: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 |
|
|
233f936876
|
Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors
|
2024-02-13 12:17:15 +03:00 |
|
|
9761a340f5
|
Move many translation keys to Common
|
2024-02-13 04:42:10 +04:00 |
|
Vladimir Khvan
|
9a66aacf7e
|
Web: Client: JavascriptSDK: modified destroyFrame
|
2024-02-12 20:33:35 +05:00 |
|
Vladimir Khvan
|
39cdc0a156
|
Web: Client: JavascriptSDK: set charset attribute in window
|
2024-02-12 19:29:50 +05:00 |
|
Vladimir Khvan
|
8bebce1037
|
Web: Client: JavascriptSDK: onSelect/onClose events were added
|
2024-02-12 18:53:33 +05:00 |
|
Vladimir Khvan
|
137207b78b
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/shared/selectors/Room/RoomSelector.types.ts
packages/shared/selectors/Room/index.tsx
|
2024-02-09 20:24:06 +05:00 |
|
Vladimir Khvan
|
eaeb000378
|
Web: Client: JavascriptSDK: fixed height setting (in percents) / added skeleton in code section
|
2024-02-08 16:39:39 +05:00 |
|
Vladimir Khvan
|
588510609b
|
Web: Client: JavascriptSDK: fixed window resize
|
2024-02-06 14:39:55 +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 |
|
Vladimir Khvan
|
33b32c21a5
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-06 13:27:38 +05:00 |
|
Akmal Isomadinov
|
251de059f4
|
Merge branch 'develop' into feature/refactoring-media-viewer
|
2024-02-05 14:31:47 +05:00 |
|
Vladimir Khvan
|
30b24d371c
|
Web: Client: JavascriptSDK: events were passed to config
|
2024-02-05 13:08:00 +05:00 |
|
|
e885c0485d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/Home/Hooks/usePublic.js
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/uk-UA/Common.json
# public/locales/zh-CN/Common.json
|
2024-02-02 16:15:04 +04:00 |
|
Vladimir Khvan
|
498155bea3
|
Web: Client: JavascriptSDK: dark mode was added for manager
|
2024-02-02 15:17:27 +05:00 |
|
Vladimir Khvan
|
b9008210ff
|
Web: Client: JavascriptSDK: button view was corrected
|
2024-02-02 14:22:23 +05:00 |
|
Vladimir Khvan
|
2bfd15a162
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-02 12:40:49 +05:00 |
|
Akmal Isomadinov
|
cb6b4d0a57
|
Merge branch 'develop' into feature/refactoring-media-viewer
# Conflicts:
# packages/common/components/MediaViewer/sub-components/Viewer/index.tsx
|
2024-02-02 12:25:09 +05:00 |
|
Vladimir Khvan
|
81fd71cb5d
|
Web: Client: JavascriptSDK: button view was added
|
2024-02-02 00:27:09 +05:00 |
|
Vladimir Khvan
|
8ec22671bf
|
Web: Client: JavascriptSDK: dark theme was added for presets page
|
2024-02-01 18:52:05 +05:00 |
|
|
077a9e1cd5
|
edited NameSorting keys
|
2024-02-01 16:18:48 +03:00 |
|
|
ee2f010de3
|
edited oform -> PDF form
|
2024-02-01 16:06:21 +03:00 |
|
|
8c0fd10645
|
JS-SDK: Fixed iframe style in loading. Changed config empty check
|
2024-02-01 14:45:23 +03:00 |
|
|
ca0b62edbb
|
JS-SDK: Fixed setting style params for frame
|
2024-02-01 13:21:08 +03:00 |
|
Vladimir Khvan
|
cdcffc31c9
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/Home/Section/Header/index.js
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/shared/components/navigation/Navigation.tsx
packages/shared/components/navigation/Navigation.types.ts
packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 15:01:55 +05:00 |
|
|
64d1e756ba
|
PortalSettings: Fixed errors for settings page on unload
|
2024-02-01 12:02:35 +03:00 |
|
Vladimir Khvan
|
dcb4b3d276
|
Web: Client: JavascriptSDK: simple room was added
|
2024-02-01 13:46:45 +05:00 |
|
|
04a31c61d0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/pages/Home/Section/Header/index.js
# packages/shared/components/navigation/Navigation.tsx
# packages/shared/components/navigation/Navigation.types.ts
# packages/shared/components/navigation/sub-components/ControlBtn.tsx
|
2024-02-01 11:36:29 +03:00 |
|
Akmal Isomadinov
|
4440677bbf
|
Merge branch 'develop' into feature/refactoring-media-viewer
|
2024-02-01 12:45:59 +05:00 |
|
Vladimir Khvan
|
40bf42d783
|
Web: Client: JavascriptSDK: filter description was added in file selector
|
2024-01-31 23:28:42 +05:00 |
|
|
9816f1743b
|
Removed useless translation key
|
2024-01-31 21:08:26 +04:00 |
|
|
91165250d6
|
Merge branch 'develop' into feature/new-tariff-bar
|
2024-01-31 21:01:07 +04:00 |
|
Akmal Isomadinov
|
0b58025361
|
Removed script tiff.min
|
2024-01-31 21:28:47 +05:00 |
|
|
54ed8d7e1d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/PublicRoom/sub-components/RoomPassword.js
# packages/login/src/client/components/CodeLogin.tsx
# packages/login/src/client/components/Login.tsx
|
2024-01-31 19:45:25 +04:00 |
|
Vladimir Khvan
|
a8efee895b
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/client/src/pages/Sdk/index.js
packages/shared/selectors/Room/RoomSelector.types.ts
packages/shared/selectors/Room/index.tsx
|
2024-01-31 13:36:21 +05:00 |
|