|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
|
a13d1ccf3b
|
Merge branch 'develop' into feature/backup
|
2022-03-23 18:12:01 +03:00 |
|
|
ff54e42a27
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-23 17:59:05 +03:00 |
|
|
cee4ca3a4e
|
Files: fix recent
|
2022-03-23 14:53:49 +03:00 |
|
|
0ff67e1f92
|
Web: Files: Article: fix crash on personal
|
2022-03-22 17:19:52 +03:00 |
|
|
64cd23a7bf
|
Files: fix download as
|
2022-03-22 16:54:54 +03:00 |
|
|
ee8b6eafc1
|
Web: Files: deleted useless folders after merge.
|
2022-03-22 13:22:51 +03:00 |
|
|
251f149eb6
|
Web: Revert withoutBodyScroll after merge.
|
2022-03-22 13:19:35 +03:00 |
|
|
e4eeb59138
|
Web: Files: UploadDataStore: fix folder update
|
2022-03-22 12:54:15 +03:00 |
|
|
9bea7b362b
|
Merge branch 'develop' into feature/backup
|
2022-03-22 09:59:55 +03:00 |
|
|
b50b2c3c6f
|
Web: Files: SharingPanel: delete useless
|
2022-03-21 17:41:28 +03:00 |
|
|
8381b3e9c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-03-21 17:15:55 +03:00 |
|
Timofey Boyko
|
8355fa388d
|
Web:Common: remove old filter component, update import and change themes
|
2022-03-21 13:56:42 +03:00 |
|
Timofey Boyko
|
c625b6c6ca
|
Web:Files: remove old filter
|
2022-03-21 13:41:36 +03:00 |
|
Timofey Boyko
|
17f1bcc446
|
Web:Files: fix display sub-menu for mobile and tablet devices
|
2022-03-21 12:26:30 +03:00 |
|
|
a72106dfae
|
Web: Files: Deleted useless file after merge.
|
2022-03-21 11:55:38 +03:00 |
|
|
5420ceff44
|
Web: Deleted useless files.
|
2022-03-21 11:52:26 +03:00 |
|
Timofey Boyko
|
685c49552a
|
Merge branch 'feature/refactoring-pagelayout' into feature/virtual-rooms-1.2
|
2022-03-21 11:41:51 +03:00 |
|
Timofey Boyko
|
133dfa3426
|
Web: fix article main button view (now correct display mobile main button when view port is increased/decreased)
|
2022-03-21 11:40:40 +03:00 |
|
|
73033f996d
|
Web: Files: Added missing translation.
|
2022-03-21 10:49:32 +03:00 |
|
|
1c74b5702b
|
Files:fix notify
|
2022-03-19 18:05:26 +03:00 |
|
|
21a8c0e0fc
|
removed httpclient ctor
|
2022-03-18 22:34:01 +03:00 |
|
|
ef600712b8
|
Merge pull request #591 from ONLYOFFICE/feature/refactoring-pagelayout
Feature/refactoring pagelayout
|
2022-03-18 19:09:26 +03:00 |
|
Timofey Boyko
|
b2924c2914
|
Web:Files: delete useless code
|
2022-03-18 18:29:41 +03:00 |
|
Timofey Boyko
|
77709f3399
|
Web:Files: synchronized first display first loader
|
2022-03-18 18:25:33 +03:00 |
|
|
f8dadfa3e5
|
Web: Files: Fix isPrivacyFolder
|
2022-03-18 18:01:46 +03:00 |
|
|
72cef1b6aa
|
Web: Files: Fix re-render ArticleMainButtonContent on history changes (removed useless goToHomePage() method)
|
2022-03-18 18:00:59 +03:00 |
|
Timofey Boyko
|
f4c591cf78
|
Web:Files: fix navigation item click
|
2022-03-18 16:36:12 +03:00 |
|
Timofey Boyko
|
7c33680d73
|
Web:Files: add title for icon button in third party list
|
2022-03-18 16:29:10 +03:00 |
|
Timofey Boyko
|
9bbcbb8e54
|
Web:Files: restore code
|
2022-03-18 15:50:18 +03:00 |
|
Timofey Boyko
|
4e3ab4a8a8
|
Web:Files:Settings: fix render connected clouds list
|
2022-03-18 13:56:26 +03:00 |
|
Timofey Boyko
|
75a8ee5641
|
Web:Files:Settings: fix render connected clouds list
|
2022-03-18 13:43:39 +03:00 |
|
Timofey Boyko
|
2c51acc636
|
Web:Files:Settings: change button size and position in connected clouds
|
2022-03-18 13:26:25 +03:00 |
|
Timofey Boyko
|
27fab6de23
|
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
|
2022-03-18 11:05:58 +03:00 |
|
Timofey Boyko
|
4023359af3
|
Web:Files: fix warning 'each Each child in a list should have a unique 'key' prop' for main button
|
2022-03-17 18:45:50 +03:00 |
|
|
ac2d679e71
|
Merge pull request #517 from ONLYOFFICE/feature/login-redesign
Feature/login redesign
|
2022-03-17 16:29:22 +03:00 |
|
|
ea502301de
|
Web: Files: Deleted horizontal scroll from Sharing panel.
|
2022-03-17 16:03:23 +03:00 |
|
|
679d0d51aa
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-17 12:42:26 +03:00 |
|
|
38d685c4ce
|
Merge branch 'develop' into feature/backup
|
2022-03-17 11:03:09 +03:00 |
|
|
e407031ec0
|
Web: Files: Tile: fix background
|
2022-03-16 16:07:55 +03:00 |
|
Timofey Boyko
|
7a22ead503
|
Web:Files: change page layout to section in file pages
|
2022-03-16 15:26:52 +03:00 |
|
Timofey Boyko
|
15c5844349
|
Web:Files:Components: delete useless code from article main button
|
2022-03-16 15:25:18 +03:00 |
|
|
c001de8f74
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-03-16 13:03:29 +03:00 |
|
|
bada6b7dd0
|
Web: Files: Hotkeys: added new translations
|
2022-03-16 11:32:19 +03:00 |
|
Timofey Boyko
|
dde7fb6694
|
Web:Files:Store: add isArticleLoaded and setIsArticleLoaded for remove article loaders
|
2022-03-16 11:29:04 +03:00 |
|
Timofey Boyko
|
429925248f
|
Web:Files: move routes and article to functional components
|
2022-03-16 11:28:24 +03:00 |
|
Timofey Boyko
|
85180f2fc1
|
Web:Files: refactoring new article and remove re-renders
|
2022-03-16 11:27:46 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
d2855e47a4
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-15 19:17:44 +03:00 |
|
Timofey Boyko
|
c85f40078a
|
Web:Files: rename 'catalog' to 'article' and update exports/imports
|
2022-03-15 17:18:46 +03:00 |
|