Commit Graph

33625 Commits

Author SHA1 Message Date
ff08a86942 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-21 12:22:04 +03:00
5afd8e6950 Fixed Bug 62196 - Rooms.Archive. File conversion available in archive room. 2023-04-21 12:21:14 +03:00
5dfbf20853 Merge branch 'develop' into feature/action-buttons-hints 2023-04-21 11:59:54 +03:00
0e4ed5ceca Merge branch 'develop' into feature/access-drop-down 2023-04-21 11:59:25 +03:00
2f178d42f9 added translations 2023-04-21 11:35:29 +03:00
6ac647a7c7
Merge pull request #1371 from ONLYOFFICE/feature/routing-optimization
Feature/routing optimization
2023-04-20 19:41:16 +04:00
Timofey Boyko
6efeb9da76 Web:Client:Store: delete useless store 2023-04-20 18:38:07 +03:00
Timofey Boyko
f65760e6ef Web:Client: rename client, confirm and portal settings router to routes 2023-04-20 18:37:15 +03:00
Timofey Boyko
ec44094956 Merge branch 'feature/routing-optimization' of https://github.com/ONLYOFFICE/DocSpace into feature/routing-optimization 2023-04-20 18:33:56 +03:00
Timofey Boyko
a6f4000d6e Web:Client: split router to client, portal settings and confirm routes 2023-04-20 18:33:35 +03:00
65737a6031 Update yarn.lock 2023-04-20 19:32:10 +04:00
DmitrySychugov
b1112e679a Merge branch 'bugfix/storybook-fixes' of github.com:ONLYOFFICE/DocSpace into bugfix/storybook-fixes 2023-04-20 20:29:09 +05:00
1d15a0345f added translations 2023-04-20 18:21:37 +03:00
DmitrySychugov
b7ddf6644b Web: Components: Snackbar - added description 2023-04-20 20:08:01 +05:00
DmitrySychugov
a742fbb765 Web: Components: RowContainer - added description 2023-04-20 19:54:39 +05:00
Timofey Boyko
8f1f0bd543 Web: move navigate and location from SettingsStore to window.DocSpace 2023-04-20 17:53:49 +03:00
1106663ca8 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-20 17:47:47 +03:00
908a8d085e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
#	packages/client/public/locales/az/Settings.json
#	packages/client/public/locales/cs/Settings.json
#	packages/client/public/locales/el-GR/Settings.json
#	packages/client/public/locales/es/Settings.json
#	packages/client/public/locales/hy-AM/MainBar.json
#	packages/client/public/locales/ko-KR/Settings.json
#	packages/client/public/locales/nl/Settings.json
#	packages/client/public/locales/sk/Settings.json
#	packages/client/public/locales/sl/Settings.json
#	packages/client/public/locales/tr/Settings.json
#	packages/client/public/locales/vi/Settings.json
2023-04-20 17:47:30 +03:00
Timofey Boyko
2df4d0f8c0 Web: remove dep from global package.json and move to common 2023-04-20 17:38:05 +03:00
Viktor Fomin
cdc1cea1a3 Fix Bug 62203: Buttons on the page confirming the change of portal owner do not work 2023-04-20 17:33:15 +03:00
Timofey Boyko
a039670fed Merge branch 'develop' into feature/routing-optimization 2023-04-20 17:29:35 +03:00
Timofey Boyko
9758b71231 Web:Client:Router: fix lazy loading 2023-04-20 17:26:27 +03:00
Timofey Boyko
9f1689963f Web: delete useless code 2023-04-20 17:26:14 +03:00
Timofey Boyko
8347b3cf0d Web:Client: add new package @loadable/component 2023-04-20 17:25:57 +03:00
1b21be4aad Update translations (portal to space) 2023-04-20 17:21:53 +03:00
DmitrySychugov
9eab7c2906 Web: Components: Slider - added description 2023-04-20 19:07:50 +05:00
6a660938de fix Bug 60605 2023-04-20 17:05:21 +03:00
NikitaVashchuk
f64450b6d9 fix bug 62197 2023-04-20 19:02:35 +05:00
DmitrySychugov
e726c134e1 Web: Components: SearchInput - added description 2023-04-20 19:01:48 +05:00
DmitrySychugov
5be3571da8 Web: Components: SaveCancelButton - added description 2023-04-20 18:58:21 +05:00
DmitrySychugov
7259801c51 Web: Components: Row - added description 2023-04-20 18:54:13 +05:00
DmitrySychugov
83c82c80a4 Web: Components: RowContent - added description 2023-04-20 18:44:13 +05:00
8879fcc5ef edited translations 2023-04-20 16:43:35 +03:00
f1f922d494 added translations 2023-04-20 15:53:49 +03:00
190fb7e5e7 Merge branch 'develop' into feature/action-buttons-hints
# Conflicts:
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
2023-04-20 15:39:46 +03:00
bccb3c86e3 Web: Files: added titles to info-panel icon, table-settings icon 2023-04-20 15:35:56 +03:00
bd21fe0c82
Merge pull request #1362 from ONLYOFFICE/feature/resize-table
Feature/resize table
2023-04-20 16:25:04 +04:00
bd8c1945e3
Merge pull request #1354 from ONLYOFFICE/feature/info-panel-toggle
Feature/info panel toggle
2023-04-20 16:24:05 +04:00
d13a440933 Merge branch 'develop' into feature/info-panel-toggle 2023-04-20 16:22:46 +04:00
Akmal Isomadinov
69f77818f7 Web:Client:PortalSettings Added missing props 2023-04-20 16:57:04 +05:00
Akmal Isomadinov
8c3608b52d Web:Client:AccountsHome Removed useless code 2023-04-20 16:31:09 +05:00
62ac77f2ce Merge branch 'develop' into bugfix/invite-panel-scroll 2023-04-20 15:07:28 +04:00
c83d90b033 Merge branch 'develop' into feature/access-drop-down 2023-04-20 15:02:52 +04:00
Timofey Boyko
a43819b974 Web:Client: fix router and links for portal settings category 2023-04-20 13:56:07 +03:00
3348134c28 Web: Files: added title to VersionHistory 2023-04-20 13:41:23 +03:00
19542a5b0f Web: Files: added new translations MarkAsVersion, MarkAsRevision 2023-04-20 13:40:32 +03:00
df13ad5afd Merge branch 'develop' into feature/resize-table 2023-04-20 14:23:50 +04:00
3b09944cf7
Merge pull request #1357 from ONLYOFFICE/feature/sort-by
Feature/sort by
2023-04-20 14:12:31 +04:00
02c3b0f795 Merge branch 'develop' into feature/sort-by 2023-04-20 14:05:52 +04:00
464aed0f62 Merge branch 'develop' into feature/info-panel-toggle 2023-04-20 13:59:27 +04:00