Commit Graph

36590 Commits

Author SHA1 Message Date
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
4ffa03b0b5 Web: Components: ModalDialog: Added hide cancel button for embedded mode 2023-07-14 14:58:57 +03:00
5b95e9df97 Web: Client: SelectFileDialog: Added hide cancel button if event not set for embedded mode 2023-07-14 14:57:13 +03:00
9a20ed685d
Merge pull request #1540 from ONLYOFFICE/feature/public-room-backend
Feature/public room backend
2023-07-14 04:54:26 -07: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
fcd56a9764 fix Bug 63301 2023-07-13 21:58:11 +03:00
b7387f4142 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-13 18:21:22 +03:00
057bccb801 added translations 2023-07-13 18:20:52 +03:00
nasrullonurullaev
ad0d470ced Passed the eventBus arguments to services (#1392) 2023-07-13 19:28:40 +05:00
64d6196517 Fixed Bug 63358 - Rooms.Hotkeys. Fixed rights 2023-07-13 16:50:23 +03:00
81f47776e9 Web: Components: Fix wrong LTR heading punctuation in RTL mode 2023-07-13 15:44:58 +02:00
568155823a Web: Client: Sdk: Fixed file selector mode, fixed button label and default filter type 2023-07-13 15:09:08 +03:00
Subhonbek
c1c9ca9beb Merge branch 'feature/rtl-interface-direction' of github.com:ONLYOFFICE/DocSpace into feature/rtl-interface-direction 2023-07-13 15:01:24 +03:00
Subhonbek
b34f10ddff web component rlt fix id in scrollbar 2023-07-13 15:01:15 +03:00
46691df72c Web: Components: Add missing semicolons in modal dialog styles 2023-07-13 13:58:27 +02:00
Subhonbek
beb232dc92 Merge branch 'feature/rtl-interface-direction' of github.com:ONLYOFFICE/DocSpace into feature/rtl-interface-direction 2023-07-13 14:21:01 +03:00
Subhonbek
1f04acb689 web component rlt fix left text 2023-07-13 14:20:05 +03:00
46390d1e30 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-13 13:46:08 +03:00
835d0e8da0 added translations 2023-07-13 13:45:17 +03:00
96586b0aa0 Merge branch 'develop' into feature/public-room-backend 2023-07-13 13:45:08 +03:00
e0f467eebf Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-13 13:43:47 +03:00
ef260b63ca Build: Tests: Fixed run tests on windows 2023-07-13 13:43:40 +03:00
a62ef6e548
Add multiarch build for DocSpace packages (#1539)
* Add arm libraries for build

* Add Multi-Arch field, fix Architecture with all

* Add build trigger on path

* Update control just to trigger workflow

* Add arm dependencies

* Add BuildArch:      noarch

* Update product.spec

* Define binaries_in_noarch_packages_terminate_build

* Add upload noarch packages

* Add noarch build for docspace

* Fix versioning of rpm packages

* Remove extra & useless functionality
2023-07-13 15:16:39 +05:00
bcaa84d175 Web: Files: added restore public-room translation 2023-07-13 13:09:11 +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
97ecc99607 Merge branch 'develop' into feature/rtl-interface-direction 2023-07-13 09:59:25 +02:00
Elyor Djalilov
141c7f24d7 Web: Client: fix style tooltips 2023-07-13 12:11:34 +05:00
Vladimir Khvan
7f4773cf4e fixed missing setIsLoading 2023-07-13 10:31:22 +05:00
3deec781d2 Revert "Add X.X.X.X tag for docker images (#1536)"
This reverts commit f0f3a5b8e5.
2023-07-12 21:18:52 +05:00
a42d2f8b6c
Merge pull request #1515 from ONLYOFFICE/bugfix/webhooks
Bugfix/webhooks
2023-07-12 19:34:49 +04:00
0091f02afc Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-12 18:21:38 +03:00
694bae6d1b added translations 2023-07-12 18:20:42 +03:00
Lemma
f0f3a5b8e5
Add X.X.X.X tag for docker images (#1536) 2023-07-12 19:28:00 +05:00
3f27bb6ce5 Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
c45ae8d990 Files: FileShareDto: added expired property, disable expired link 2023-07-12 14:23:45 +03:00
d749508640 Files: ExternalShare: refactoring 2023-07-12 14:20:22 +03:00
66dcbb3e57 Files: ExternalLink: fixed expiration date converting 2023-07-12 14:19:58 +03:00
22b0c066e9 Fix json package installation for deb\rpm 2023-07-12 15:32:12 +05:00
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
Subhonbek
c0e1cc062e web component rlt combo-button fix margin auto 2023-07-12 11:43:40 +03:00
Subhonbek
09099c5dbe web component rlt combo-button fix margin auto 2023-07-12 11:38:21 +03:00
d333250054 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0 2023-07-12 11:34:43 +03:00
9c965577ad Files: fixed disabling room invite link after expiration 2023-07-12 11:34:28 +03:00
Subhonbek
af7af5e587 web component rlt combo-button fix margin auto 2023-07-12 11:29:38 +03:00
Subhonbek
b8df10d0fb Merge branch 'feature/rtl-interface-direction' of github.com:ONLYOFFICE/DocSpace into feature/rtl-interface-direction 2023-07-12 11:26:24 +03:00
Subhonbek
dce44d5d79 web component rlt combo-button fix margin auto 2023-07-12 11:24:16 +03:00
f630cf0593 Merge branch 'develop' into feature/rtl-interface-direction 2023-07-12 10:12:27 +02:00
Subhonbek
1cda9f88f5 web component rlt tab container fix getScrollLeft 2023-07-12 11:07:37 +03:00
Nasrullo Nurullaev
af3e1e009f
fix Bug 62882 - Add product name to display and description service names (#1534) 2023-07-12 12:40:48 +05:00