|
|
24fba12ce3
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBar.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBlock.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/StyledPublicRoom.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/FilesStore.js
# packages/common/constants/index.js
# packages/components/date-picker/index.js
# packages/components/selected-item/index.js
|
2023-07-14 15:40:47 +03:00 |
|
|
|
440ba6a13c
|
Web: Client: Sdk: Fixed stringify functions for events
|
2023-07-14 14:59:46 +03:00 |
|
|
|
8b5eebffab
|
Web: Client: Sdk: Added selectorType property for file selector mode, added new base filter type : userFolderOnly
|
2023-07-14 10:27:43 +03:00 |
|
|
|
568155823a
|
Web: Client: Sdk: Fixed file selector mode, fixed button label and default filter type
|
2023-07-13 15:09:08 +03:00 |
|
|
|
dc59259fd0
|
Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.
# Conflicts:
# build/install/OneClickInstall/install-Docker.sh
# build/install/win/DocSpace.aip
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
|
2023-07-13 13:02:08 +03:00 |
|
|
|
10ddb99d11
|
Web: Client: PortalSettings: Added "Integration request" block
|
2023-07-10 23:58:58 +03:00 |
|
|
|
2e14572fc0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
# public/images/clock.react.svg
|
2023-07-07 10:35:33 +03:00 |
|
Vladimir Khvan
|
ae168c410a
|
clock svg was added
|
2023-07-05 14:16:13 +05:00 |
|
|
|
80620d0b0d
|
Web: Client: Sdk: Restored filter property
|
2023-07-04 18:05:49 +03:00 |
|
|
|
2f79b3baae
|
added translations
|
2023-06-30 13:40:20 +03:00 |
|
|
|
870d4efac5
|
added translations
|
2023-06-29 18:06:36 +03:00 |
|
|
|
ae01f22e73
|
Web: Changed empty-folder-image.svg to rooms.react.svg
|
2023-06-29 13:56:06 +04:00 |
|
|
|
a1df1be7c6
|
Web: Changed rooms icon
|
2023-06-28 14:52:31 +04:00 |
|
|
|
c505c8dc2b
|
added translations
|
2023-06-28 13:35:40 +03:00 |
|
|
|
c0a1608691
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-27 16:43:58 +03:00 |
|
|
|
3ba27cd577
|
added translations
|
2023-06-27 16:42:20 +03:00 |
|
|
|
794196e3a8
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-27 12:42:23 +03:00 |
|
|
|
ab35c4e497
|
Web: Client: FilesStore: Added getRooms by filter action. Added getRooms method to SDK
|
2023-06-27 12:42:16 +03:00 |
|
|
|
90004e8f94
|
added translations
|
2023-06-27 10:42:38 +03:00 |
|
|
|
1414483526
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-26 16:02:34 +03:00 |
|
|
|
c737c5838f
|
added translations
|
2023-06-26 16:02:13 +03:00 |
|
|
|
412f64960b
|
Web: Client: SDK: Fixed create room signature
|
2023-06-26 15:45:35 +03:00 |
|
|
|
9179797473
|
Web: Client: DeveloperTools: Restored title and class names after destroy frame
|
2023-06-22 16:18:45 +03:00 |
|
|
|
e7c5e5520f
|
Web: Client: Removed useless code
|
2023-06-22 15:40:01 +03:00 |
|
|
|
80e732bbbf
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-22 14:35:14 +03:00 |
|
|
|
c29439c1aa
|
added translations
|
2023-06-22 14:06:48 +03:00 |
|
|
|
43c992c85c
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-22 10:23:01 +03:00 |
|
|
|
6858287810
|
added translations
|
2023-06-21 18:41:09 +03:00 |
|
|
|
384832c272
|
Web: Client: Sdk: Fixed pathParts and Breadcrumbs. Fixed redirect on no access. Fixed theme preload. Fixed locale usage
|
2023-06-21 17:58:19 +03:00 |
|
|
|
f368b3fbbb
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-20 17:37:35 +03:00 |
|
|
|
05386e4d0d
|
added translations
|
2023-06-20 16:10:41 +03:00 |
|
|
|
4ddef13c04
|
Web: Client: Sdk: Added timeout for post messages
|
2023-06-20 13:41:01 +03:00 |
|
|
|
521b00c983
|
Web: Client: Sdk: Fixed hash api call
|
2023-06-20 12:46:13 +03:00 |
|
|
|
c37687b50d
|
Web: Client: Sdk: Fixed logs
|
2023-06-19 17:27:08 +03:00 |
|
|
|
0ccb36e559
|
Web: Client: Sdk: Fixed init methods signatures. Fixed config clean after destroy frame.
|
2023-06-19 14:49:19 +03:00 |
|
|
|
c3e7ddd9f4
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-19 13:47:54 +03:00 |
|
|
|
9c5ee2e7c5
|
Web: Client: Sdk: Logs
|
2023-06-19 13:17:48 +03:00 |
|
|
|
c79d171b1d
|
added translations
|
2023-06-19 12:30:37 +03:00 |
|
|
|
f30ed529a3
|
Web: Client: Sdk: Fixed tasks chain
|
2023-06-16 18:34:12 +03:00 |
|
|
|
fcc02491ee
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-16 14:59:15 +03:00 |
|
|
|
855c11b6c7
|
Web: Client: Sdk: Apply theme from config
|
2023-06-16 14:54:08 +03:00 |
|
|
|
2a4c002e4b
|
Web: Client: Sdk: Logs
|
2023-06-16 14:23:21 +03:00 |
|
|
|
a736daa480
|
Web: Client: Sdk: Added createTag, addTagsToRoom, removeTagsFromRoom. Fixed callback errors
|
2023-06-16 14:06:12 +03:00 |
|
|
|
4920c975c1
|
Added support of new hy-AM culture
|
2023-06-16 13:28:56 +04:00 |
|
|
|
6dafe52577
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-13 09:28:20 +03:00 |
|
Viktor Fomin
|
fc688f4cc6
|
Web: add images
|
2023-06-12 22:27:09 +03:00 |
|
|
|
20bf5fa8d5
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/store/index.js
|
2023-06-09 11:59:10 +03:00 |
|
|
|
4edfedab57
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-09 10:14:04 +03:00 |
|
|
|
ca3f29cd5d
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-08 18:25:15 +03:00 |
|
|
|
fef76e032f
|
added translations
|
2023-06-08 18:24:46 +03:00 |
|
|
|
893aa52501
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-08 16:14:09 +03:00 |
|
|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
|
|
ca03feb835
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-05 14:28:21 +03:00 |
|
|
|
13eb9ea37a
|
Web: Files: added new translations
|
2023-06-05 13:44:55 +03:00 |
|
|
|
7e601fa5e2
|
Merge branch 'develop' into feature/public-room
|
2023-06-05 12:38:12 +03:00 |
|
Viktor Fomin
|
9974635112
|
Web: change images
|
2023-06-05 12:25:17 +03:00 |
|
Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
Viktor Fomin
|
cdd0367153
|
Web: add translations
|
2023-05-31 16:33:17 +03:00 |
|
Viktor Fomin
|
ae6577939b
|
Web: add translations
|
2023-05-31 16:33:17 +03:00 |
|
Viktor Fomin
|
db3fa67e8d
|
Web: fix translations
|
2023-05-31 16:33:17 +03:00 |
|
Viktor Fomin
|
1997825895
|
Web: add translations
|
2023-05-31 16:33:17 +03:00 |
|
Viktor Fomin
|
910666ce99
|
Web: add translations
|
2023-05-31 16:32:34 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
Vladimir Khvan
|
0dde9188d3
|
existing svg was deleted
|
2023-05-31 16:00:51 +05:00 |
|
Vladimir Khvan
|
67a775cd00
|
empty filter dark image was added
|
2023-05-31 16:00:39 +05:00 |
|
|
|
9999389f44
|
Merge branch 'develop' into feature/public-room
|
2023-05-31 11:07:34 +03:00 |
|
|
|
3b74cf457a
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
|
2023-05-30 12:43:31 +03:00 |
|
|
|
4214470b2c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 13:16:26 +04:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
797df5b076
|
Merge branch 'develop' into feature/public-room
|
2023-05-26 12:51:30 +03:00 |
|
|
|
edfa4b781b
|
Web: Client: Sdk: Added initViewerEditor, initRoomSelector, initFileSelector, initSystem. Fixed base config.
|
2023-05-26 12:33:56 +03:00 |
|
|
|
302c0bcafe
|
Web: Scripts: Api: Fixed routes, added locale and theme to config
|
2023-05-26 12:33:55 +03:00 |
|
|
|
295d1b3105
|
Web: Scripts: Api: Fixed frames element inside sdk
|
2023-05-26 12:33:55 +03:00 |
|
|
|
794f55d8a4
|
Web: Scripts: Api: Added SDK section to DocSpace object. Added login, logout, initManager, initEditor, initSelector methods.
|
2023-05-26 12:33:55 +03:00 |
|
|
|
3b696b64fb
|
Web: Scripts: Api: Added multi-instance for frames. Fixed default config. Adjusted callbacks.
|
2023-05-26 12:33:55 +03:00 |
|
|
|
1e6d106673
|
Web: Client: Selector: Fixed events from js-sdk
|
2023-05-26 12:33:54 +03:00 |
|
|
|
37f0bf9920
|
SDK: Added events callback from config
|
2023-05-26 12:33:54 +03:00 |
|
|
|
53baa82197
|
Added methods for creating hash
|
2023-05-26 12:33:54 +03:00 |
|
|
|
ca5ab6cf2b
|
Added room selector property
|
2023-05-26 12:33:54 +03:00 |
|
|
|
905378cdd9
|
Fixed callback listener and config
|
2023-05-26 12:33:53 +03:00 |
|
|
|
e08f381074
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-25 15:29:21 +04:00 |
|
Elyor Djalilov
|
b5f0b25515
|
Web: Components: filling-status-line
|
2023-05-25 14:44:37 +05:00 |
|
|
|
94388c0616
|
Merge branch 'hotfix/v1.0.1' into feature/standalone
|
2023-05-23 17:00:12 +03:00 |
|
|
|
0f918f0c3f
|
Web: Files: added title icon to public room
|
2023-05-23 16:13:58 +03:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
|
|
0e047b71b6
|
Merge pull request #1421 from ONLYOFFICE/feature/pdf-viewer
Feature/pdf viewer
|
2023-05-19 18:42:35 +04:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
|
|
b6250ec024
|
Web: Added bonus to the article component.
|
2023-05-19 17:21:49 +03:00 |
|
Akmal Isomadinov
|
23c409dfaf
|
Web: Added the ability to disable pdf viewer
|
2023-05-19 16:19:06 +05:00 |
|
Akmal Isomadinov
|
95aa19ff03
|
Web: Updated PDF viewer URL
|
2023-05-19 13:01:27 +05:00 |
|
|
|
d102bf6dd8
|
Web: Moved translation to common.
|
2023-05-17 18:08:38 +03:00 |
|
|
|
b1d48db4a5
|
Web:Add locales DescriptionOfTheEveryoneRole, DescriptionOfTheRoleQueue.
|
2023-05-17 16:47:13 +03:00 |
|
Vladimir Khvan
|
d869ef9b0c
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-17 14:11:26 +05:00 |
|
|
|
0b4439d1cf
|
Web:Add example avatar.
|
2023-05-17 12:09:49 +03:00 |
|
|
|
d70c981f7f
|
Web: Files: added public-room translations
|
2023-05-16 14:23:17 +03:00 |
|
|
|
4401a35a1f
|
Merge branch 'feature/standalone' of https://github.com/ONLYOFFICE/DocSpace into feature/standalone
|
2023-05-16 13:12:24 +04:00 |
|
|
|
0d54ec005a
|
Merge branch 'hotfix/v1.0.1' into feature/standalone
|
2023-05-16 13:11:19 +04:00 |
|
|
|
9a55faed05
|
Web: Added enterprise alert.
|
2023-05-16 10:44:44 +03:00 |
|
