Commit Graph

24445 Commits

Author SHA1 Message Date
50659cdeb9 Common: ColorTheme: fix 2022-08-30 17:03:45 +03:00
03f6553b01 Web: Fix Editor open 2022-08-30 16:54:09 +03:00
2d33893d50 PortalSettings: HistoryMainContent: fix button style 2022-08-30 16:47:19 +03:00
de5ce1fa1a Web: Fix TargetUserStore on Profile page 2022-08-30 16:19:00 +03:00
db4e491ea9 Web: Files: fixed InfiniteLoaderComponent height 2022-08-30 15:41:09 +03:00
TimofeyBoyko
143f9a148a Web:Accounts: delete withPeopleContextOptions HOC and add context group menu 2022-08-30 14:39:15 +03:00
a786e19afa Web: Components: fixed InfiniteLoaderComponent crash 2022-08-30 14:37:58 +03:00
a8e5175b57 Web: Fix undefined user in userStore after logout->login 2022-08-30 14:35:38 +03:00
c05307acaa PortalSettings: Security: hide settings button 2022-08-30 14:30:49 +03:00
58424f1674 Components: TableContainer: add showSettings prop 2022-08-30 14:30:23 +03:00
b219b431f3 PortalSettings: HistoryMainContent: fix buttons style 2022-08-30 14:21:03 +03:00
6da7e16e52 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-30 14:13:58 +03:00
55eae08689 PortalSettings: HistoryMainContent: fix input style 2022-08-30 14:13:14 +03:00
0488dc63d2 PortalSettings: Security: delete access rights 2022-08-30 14:03:45 +03:00
d426b2f5d2 FederatedLogin: deleted unnecessary 2022-08-30 13:08:55 +03:00
df0d4bbceb Merge branch 'develop' into feature/private-virtual-rooms 2022-08-30 13:06:19 +03:00
da7bea6736 Files: refactor 2022-08-30 13:01:27 +03:00
4092c567b6 Files: fix 2022-08-30 12:59:39 +03:00
13a1da0b04 Files: added private 2022-08-30 12:59:20 +03:00
9e949d52ad Update yarn.lock 2022-08-30 12:55:41 +03:00
778b27ed5c
Merge branch 'develop' into feature/security-history-audit 2022-08-30 12:55:38 +03:00
a20a4ac9e1
Merge pull request #778 from ONLYOFFICE/feature/settings-menu
Feature/settings menu
2022-08-30 12:52:44 +03:00
547c1782f1 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
#	packages/client/public/locales/en/Settings.json
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
2022-08-30 12:34:48 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
21ee981bba
Merge pull request #762 from ONLYOFFICE/feature/settings-common
Feature/settings common
2022-08-30 12:01:11 +03:00
TimofeyBoyko
b737830e69 Web:Common:Api: delete useless code 2022-08-30 11:57:06 +03:00
TimofeyBoyko
2679f9f38e Web:Accounts:InfoPanel: fix scroll after open combobox 2022-08-30 11:33:08 +03:00
TimofeyBoyko
ff97d4a8f3 Web:Accounts:InfoPanel: add context menu 2022-08-30 10:48:21 +03:00
5829654183 Web:Common:Fix. 2022-08-30 10:35:24 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
3029650d85 Web: Client: create MainContent component 2022-08-30 11:53:54 +05:00
dc3ba67fea Web: Client: added DownloadReportBtn ru translation 2022-08-30 11:53:06 +05:00
e6e45ce2d7 Web:Common:Fix. 2022-08-29 22:43:29 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
08832f005c Files: refactor 2022-08-29 22:10:27 +03:00
15f5b67008 FederationLogin: refactor 2022-08-29 22:08:55 +03:00
b22c5464f5 Web:Client:Add IndicatorLoaderTheme. 2022-08-29 21:43:58 +03:00
899d7372d4 Web:Components:Add SliderTheme. 2022-08-29 21:43:25 +03:00
d8d40b1ae1 Web:Common:Add SliderTheme, IndicatorLoaderTheme. 2022-08-29 21:42:47 +03:00
c46fa39060 Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/index.Files.js
2022-08-29 18:27:33 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
1abc4a70e9
Merge pull request #775 from ONLYOFFICE/feature/oforms-scroll
Feature/oforms scroll
2022-08-29 18:10:00 +03:00
d908ca1ce4 Web: Fix translation of ByLastModifiedDate key 2022-08-29 18:09:32 +03:00
4993a35168 PortalSettings: WhiteLabel: fix save 2022-08-29 17:56:59 +03:00
TimofeyBoyko
8d893e6641 Web:Accounts: move contextOptions from HOCs to store 2022-08-29 17:42:14 +03:00
3db342ffec Merge branch 'develop' into feature/private-virtual-rooms 2022-08-29 17:39:57 +03:00
646411c7d3 Web: Files: fixed infinite-scroll for thirdparty-folders 2022-08-29 17:38:01 +03:00
aca4d65f2b Merge branch 'develop' into feature/oforms-scroll 2022-08-29 17:32:48 +03:00
TimofeyBoyko
8bc35aa337 Web:Pages:Accounts: fix warnings 2022-08-29 17:29:23 +03:00
TimofeyBoyko
40655be681 Web:Pages:Accounts: add bufferSelection to info panel 2022-08-29 17:29:07 +03:00