Commit Graph

8188 Commits

Author SHA1 Message Date
Timofey Boyko
98e80faa5f Web:People:Article: change term for displaying desktop or mobile article main button 2022-04-04 10:54:46 +03:00
Timofey Boyko
d2c59d5ac9 Web:Files:Article: change term for displayin desktop or mobile article main button 2022-04-04 10:54:29 +03:00
Timofey Boyko
f21e6e6ffe Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 09:55:40 +03:00
fdfa1142c4 Merge branch 'feature/virtual-rooms-1.2' into feature/confirm-redesign 2022-04-01 18:18:35 +03:00
5dab252350 Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-01 18:14:51 +03:00
Timofey Boyko
8c6c2cbb58 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-01 18:14:06 +03:00
mushka
562bd9d088 changed thumbnail border 2022-04-01 17:42:45 +03:00
mushka
fb2cb1316a changed thumbnail styling 2022-04-01 17:39:03 +03:00
99cdaa0440 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-01 15:46:42 +03:00
3ca90084e6 Web: Files: Fix get target of undefined 2022-04-01 15:44:39 +03:00
119d283027 Web: Files: Fix pathParts undefined 2022-04-01 15:44:03 +03:00
Timofey Boyko
02ba27f9c4 Web:Files:Store: fix error in hotkey store for activateHotkeys method 2022-04-01 15:02:20 +03:00
mushka
562e047da1 fixed undefined properties bug 2022-04-01 13:53:35 +03:00
Timofey Boyko
5fbbcc7c77 Web:Files:Section: change table group menu width for tablet and mobile devices 2022-04-01 12:39:58 +03:00
mushka
40cb0fd01f Merge branch 'feature/info-panel' of github.com:ONLYOFFICE/AppServer into feature/info-panel 2022-04-01 12:18:29 +03:00
mushka
6a3e94a0d5 added group support for access component & temporary removed Location system property 2022-04-01 12:16:40 +03:00
90a3513630 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-31 15:47:47 +03:00
mushka
1c5be7f82e fixed visualization of items with long titles 2022-03-31 15:04:09 +03:00
d33952a707 Web: Files: Removed temp console.log 2022-03-31 12:54:26 +03:00
mushka
e4ab022fb9 dark theme redesign 2022-03-30 21:59:00 +03:00
mushka
85663d7e5b removed title from InfoPanelWrapper & coded exception for files with undefined extension 2022-03-30 20:48:54 +03:00
Timofey Boyko
3b2ead5568 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-30 18:17:50 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
75bd270037 Web: Files: Fix thumbnails: increased size and replaced 'resize' to real size 2022-03-29 22:03:11 +03:00
80de482c4d Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 21:06:04 +03:00
047a2f18a0 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-29 20:31:17 +03:00
Timofey Boyko
fab034094f Web:People:GroupSelector: add correct total prop 2022-03-29 17:58:15 +03:00
Timofey Boyko
d4dd11129c Web:Files:AddUsersPanels: change groups id for selected options 2022-03-29 17:54:24 +03:00
d3b6a4eeab Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 16:33:04 +03:00
Timofey Boyko
0ffb92d56e Web:Files:Section: fix table group menu width for mobile and tablet devices 2022-03-29 14:37:22 +03:00
mushka
4e4ecec78f added dark theme support & moved context options "view details" button 2022-03-29 13:59:56 +03:00
357bfc216f Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 11:52:43 +03:00
1129f0b509 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 11:30:04 +03:00
adb8e4e680 Web: Files: TableView: use avatar in author cell 2022-03-29 11:29:53 +03:00
Timofey Boyko
89525d49e4 Web:Files: fix third-party 24px folder-icons 2022-03-29 11:14:57 +03:00
Timofey Boyko
bd94ebb621 Web:Files: change 24px folder-icon for thirdparty 2022-03-29 10:09:27 +03:00
Timofey Boyko
448d4eecd5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 18:34:05 +03:00
Timofey Boyko
9d428ffa3d Web:Files: increase rect of 24px folder-icon 2022-03-28 18:32:11 +03:00
265132dbec Web: People" ProfileAction: fix dialogs 2022-03-28 17:39:53 +03:00
004435936e Web: Files: Hotkeys: fixed keyboard input 2022-03-28 17:05:47 +03:00
mushka
5a4b36df74 translation tweaks 2022-03-28 16:53:27 +03:00
dfa851221f Web: moved load language path to utils, added clearInterval 2022-03-28 17:33:42 +05:00
a1daa79bbc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-28 15:18:08 +03:00
bd6753df91 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-28 14:17:59 +03:00
mushka
290e65288e tweaked getting selection, removed unused code 2022-03-28 12:44:35 +03:00
Timofey Boyko
d02b67e41f Web:Files:Settings: fix content-width for conntected clouds settings 2022-03-28 12:36:23 +03:00
Timofey Boyko
4161b16817 Web:Files:Settings: fix horizontal scroll of tabs when settings is mount 2022-03-28 12:21:25 +03:00
mushka
8df40dbca7 changed dateTime format to vary with language settings 2022-03-28 12:01:12 +03:00
Timofey Boyko
bdea1715a4 Web:Files:Settings: fix content-width 2022-03-28 11:58:57 +03:00
32186f21e7 ResponseStream: fix 2022-03-28 11:57:18 +03:00
Timofey Boyko
b13336a8be Web:Files:Settings: fix bug when forcesave show old value 2022-03-28 11:51:54 +03:00
Timofey Boyko
66bb0df3a5 Web:Files:Settings: fix bugs when storeForcesave show old value 2022-03-28 11:48:54 +03:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +03:00
Timofey Boyko
d2e192d048 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 11:15:47 +03:00
mushka
05fe1a8cb9 removed unused InfoPanelStore methods 2022-03-28 11:14:48 +03:00
Timofey Boyko
e2fa31d9a4 Web:Files:Settings: add tabs for page; move AdminSettings, CommonSettings to functional components; move StyledSettings to separate file 2022-03-28 11:14:31 +03:00
Timofey Boyko
a9c3d66f0d Web:Files:Article: disable mobile main button for settings page 2022-03-28 11:12:15 +03:00
Timofey Boyko
3418cb1ca7 Web:Files: add new keys 'Admin' and 'Common' for settings of eu and ru locales 2022-03-28 11:10:22 +03:00
7abe990d96 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-28 12:36:11 +05:00
8ccfaf1e79 Web: People: added ads to the people module 2022-03-28 12:27:53 +05:00
72bf0297ef Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-26 15:25:51 +03:00
31c37dfc46 Web: Files: Tile: fix checked style 2022-03-26 15:05:56 +03:00
bbd199bf6d Web: Files: DownloadAppList: use theme 2022-03-26 13:59:22 +03:00
75cf73d241 Web: People: fix unlink two-factor app 2022-03-26 13:04:33 +03:00
mushka
b0dd8d1077 fixed content gaps and deleted loaders 2022-03-25 18:58:07 +03:00
mushka
cd22e7da41 fixed withFileActions bug 2022-03-25 17:09:24 +03:00
mushka
ae33a464e3 removed onFileClick action 2022-03-25 17:04:55 +03:00
mushka
fcff7d4354 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-25 16:20:48 +03:00
mushka
9de69a3ff6 some tweaks 2022-03-25 12:10:23 +03:00
Timofey Boyko
fe3f9b59e8 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-25 10:11:00 +03:00
Timofey Boyko
7248641545 Web:People: fixed selected options of group and people selector 2022-03-25 10:10:17 +03:00
Timofey Boyko
5fea741e80 Web:People:Components: add 'total' property to state and add it to advanced selector 2022-03-25 10:09:39 +03:00
Timofey Boyko
9c331af8dd Web:People:Components: change getting selected options from state to props 2022-03-25 10:08:53 +03:00
Timofey Boyko
7f6461e3b9 Web:Files:Panels: add selected options for group and people selector 2022-03-25 10:07:17 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
mushka
1d80eb1a9d refactored open/close behaviour + redesigned checkbox header 2022-03-24 17:57:36 +03:00
Timofey Boyko
6a9806117b Web:Common:AdvancedSelector: fix bugs with re-render list, add onSelectAll function, move to functional components renders option and group list, create group header component, change props isChecked and isIndeterminate for groups, fix default styles for advanced selector with aside view 2022-03-24 17:52:21 +03:00
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
f464eb6e35 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-24 12:08:58 +05: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
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05:00
5b793b1772 Web: Files: added section bar 2022-03-23 16:08:05 +05: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
mushka
bd20587a2b fixed context menu and added first-close-disable interaction 2022-03-22 14:59:34 +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
476cec2607 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:50:23 +05:00
d13ef622f8 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:16:20 +05:00
9bea7b362b Merge branch 'develop' into feature/backup 2022-03-22 09:59:55 +03:00
mushka
c4b470f98a bugfixes 2022-03-21 18:42:23 +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
df76602dac Web: Files: fixed on close banner function 2022-03-21 16:37:03 +05:00
Timofey Boyko
0d7371b8f7 Web:People: remove old filter 2022-03-21 13:57:18 +03:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00