|
|
ca8e47dbc7
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 12:16:51 +03:00 |
|
|
|
a150b59fd9
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-05 12:16:27 +03:00 |
|
|
|
49abfdf84a
|
fix docxf templates
|
2022-04-05 12:07:46 +03:00 |
|
Timofey Boyko
|
711fc4a279
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-05 10:46:01 +03:00 |
|
Timofey Boyko
|
88c90f25cb
|
Web:People:Section: fix location and size group-button-menu for all device type
|
2022-04-05 10:35:57 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
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 |
|
Timofey Boyko
|
02ba27f9c4
|
Web:Files:Store: fix error in hotkey store for activateHotkeys method
|
2022-04-01 15:02:20 +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 |
|
|
|
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 |
|
|
|
d33952a707
|
Web: Files: Removed temp console.log
|
2022-03-31 12:54:26 +03:00 |
|
Timofey Boyko
|
3b2ead5568
|
Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner
|
2022-03-30 18:17:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
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 |
|
