|
|
7c3af54718
|
Web.Api: fix
|
2022-09-01 19:38:26 +03:00 |
|
|
|
7895a214c9
|
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
Feature/private virtual rooms
|
2022-09-01 19:34:12 +04:00 |
|
|
|
bf4a27def5
|
Web.Api: added feed api
|
2022-09-01 18:22:40 +03:00 |
|
|
|
91d396c026
|
Feed: refactor
|
2022-09-01 18:19:38 +03:00 |
|
|
|
e966afb49a
|
Feed: fix
|
2022-09-01 18:19:22 +03:00 |
|
|
|
effe113ff0
|
Feed: refactor
|
2022-09-01 18:19:17 +03:00 |
|
|
|
c25aa53c79
|
Web: Info Panel: fix translation
|
2022-09-01 17:21:07 +03:00 |
|
|
|
ed60cd1a01
|
Web: Move to dialog: fix translation
|
2022-09-01 17:18:41 +03:00 |
|
Artem Tarasov
|
b0019f0967
|
Web: Login: deleted unnecessary code
|
2022-09-01 14:57:32 +03:00 |
|
Artem Tarasov
|
45bcfe4a8d
|
Web: Login/Client: fixed parameter url name
|
2022-09-01 14:53:37 +03:00 |
|
|
|
f751cc5a8b
|
Web: Auto-fix
|
2022-09-01 12:22:20 +03:00 |
|
|
|
14de652fa7
|
Build: Added new service Login SSR
|
2022-09-01 12:21:55 +03:00 |
|
|
|
ef0c7de7bd
|
Merge pull request #784 from ONLYOFFICE/feature/edit-ThirdPartyResourceDescription
Feature/edit third party resource description
|
2022-09-01 11:51:33 +03:00 |
|
Tatiana Lopaeva
|
f6d2c6e5b4
|
Merge branch 'develop' into feature/edit-ThirdPartyResourceDescription
|
2022-09-01 11:50:46 +03:00 |
|
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
|
|
8de4c5ee34
|
edited ThirdPartyResourceDescription zh-CN
|
2022-09-01 11:04:03 +03:00 |
|
TimofeyBoyko
|
4d74c6d6da
|
Web:Client: add change portal owner dialog
|
2022-09-01 10:44:49 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
Artem Tarasov
|
3f27595995
|
Web: Login: fixed server build
|
2022-09-01 01:50:27 +03:00 |
|
Artem Tarasov
|
3e34505eed
|
Web: Login/Components: fixed styles
|
2022-09-01 01:14:24 +03:00 |
|
|
|
b96dc2425c
|
Api: fixed delete method
|
2022-08-31 22:27:30 +03:00 |
|
|
|
df96629834
|
Core: fixed user cache
|
2022-08-31 21:06:26 +03:00 |
|
|
|
8e82656e57
|
Files.Service: added context id for folders inside the room
|
2022-08-31 20:06:57 +03:00 |
|
|
|
257693d3f6
|
Files.Service: added context id for files inside the room
|
2022-08-31 20:06:49 +03:00 |
|
|
|
99f62b936d
|
Files: added getting parent room IDs for the folder list
|
2022-08-31 20:04:52 +03:00 |
|
|
|
481223a51b
|
Files: added context id
|
2022-08-31 20:02:56 +03:00 |
|
Artem Tarasov
|
8c28fda299
|
Web: Login/ColorTheme: fixed ssr
|
2022-08-31 18:32:13 +03:00 |
|
Artem Tarasov
|
d8e98fa208
|
Web: Login: MoreLogin mf fix
|
2022-08-31 18:02:05 +03:00 |
|
|
|
49de93c89d
|
Merge pull request #782 from ONLYOFFICE/feature/accounts-list
Feature/accounts list
|
2022-08-31 17:55:53 +03:00 |
|
Artem Tarasov
|
beed3b715a
|
Web: Client: fixed crash after logout
|
2022-08-31 17:42:41 +03:00 |
|
TimofeyBoyko
|
9689bdc595
|
Merge branch 'feature/accounts-list' of github.com:ONLYOFFICE/DocSpace into feature/accounts-list
|
2022-08-31 17:38:11 +03:00 |
|
TimofeyBoyko
|
184e998dc2
|
Web:Dialogs:ChangeEmailDialog: fix styles
|
2022-08-31 17:37:31 +03:00 |
|
|
|
d18e8fb2e5
|
Merge branch 'feature/accounts-list' of github.com:ONLYOFFICE/DocSpace into feature/accounts-list
|
2022-08-31 17:34:08 +03:00 |
|
Artem Tarasov
|
04122f64fa
|
Web: Components/Common: added LoginStore support
|
2022-08-31 17:33:58 +03:00 |
|
|
|
29f9af8e90
|
Web: Fix authStore link
|
2022-08-31 17:33:54 +03:00 |
|
Artem Tarasov
|
1931e56f07
|
Web: Login: added LoginStore
|
2022-08-31 17:32:33 +03:00 |
|
|
|
47f4c557b4
|
edited key: ThirdPartyResourceDescription
|
2022-08-31 17:22:23 +03:00 |
|
TimofeyBoyko
|
3d73366c90
|
Web:Store:SelectionPeopleStore: fix authStore
|
2022-08-31 16:46:46 +03:00 |
|
TimofeyBoyko
|
ad5ecdb24b
|
Web:Store:PeopleStore: delete useless store
|
2022-08-31 16:35:09 +03:00 |
|
TimofeyBoyko
|
34557b2e40
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 16:31:29 +03:00 |
|
Artem Tarasov
|
4ad6140192
|
Web: Client: fix after merge
|
2022-08-31 16:28:24 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
|
|
c35d51bd8e
|
Files.Service: added rooms module
|
2022-08-31 16:11:51 +03:00 |
|
|
|
e811c0e496
|
Files.Service: refactor
|
2022-08-31 16:10:42 +03:00 |
|
|
|
7a7ae03b0e
|
Files: fix security
|
2022-08-31 16:10:20 +03:00 |
|
|
|
8110048220
|
Files: added rooms feeds, refactor, fix
|
2022-08-31 16:10:10 +03:00 |
|
|
|
a48b836633
|
Feed: added rooms module, refactor
|
2022-08-31 16:08:14 +03:00 |
|
|
|
849591813d
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 15:53:14 +03:00 |
|
|
|
409d05d23f
|
Merge pull request #783 from ONLYOFFICE/bugfix/init-reset-stores
Bugfix/init reset stores
|
2022-08-31 15:43:56 +03:00 |
|
|
|
370696aba0
|
Web: Fixed property name for ColorTheme component, changed type => themeId
|
2022-08-31 15:38:39 +03:00 |
|
