|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
|
2d24cb25ae
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:17:56 +03:00 |
|
Timofey Boyko
|
e2f8f40086
|
Web:Files:SharingPanel: add truncate for sharing panel header
|
2022-04-21 18:15:34 +03:00 |
|
Timofey Boyko
|
796e3448bc
|
Web:Files:SharingPanel: add access rights translate
|
2022-04-21 18:10:19 +03:00 |
|
|
|
0c141bba1a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 18:08:42 +03:00 |
|
Timofey Boyko
|
bf8ac30f6f
|
Web:Files:add new key 'AccessRights' for EN and RU locales
|
2022-04-21 18:07:58 +03:00 |
|
|
|
1f9fa82051
|
Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength".
|
2022-04-21 18:07:26 +03:00 |
|
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
|
|
742d728013
|
Merge pull request #627 from ONLYOFFICE/feature/oforms-gallery
Feature/oforms gallery
|
2022-04-21 10:22:38 -04:00 |
|
|
|
f8088cfbd2
|
Web: Files: fixed gallery translations, refactoring
|
2022-04-21 17:18:01 +03:00 |
|
|
|
a9a528ab84
|
Web: Files: createFormFromTemplate replaced with createFile
|
2022-04-21 16:57:44 +03:00 |
|
Timofey Boyko
|
8c12ec36d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 16:51:59 +03:00 |
|
Timofey Boyko
|
0428c3d6af
|
Web:Client:Components: set correct height for main and article containers for IOS devices
|
2022-04-21 16:51:51 +03:00 |
|
Timofey Boyko
|
fd331f9a17
|
Web:Common:Article: add id to article container
|
2022-04-21 16:51:01 +03:00 |
|
|
|
8b2114aea3
|
Web: Files: fixed FORM_GALLERY_URL
|
2022-04-21 16:42:27 +03:00 |
|
|
|
17cdd4b655
|
Web: Files: changed oforms loader
|
2022-04-21 16:37:32 +03:00 |
|
|
|
3373a01d9e
|
Web: Client: NavMenu: fix logo pos
|
2022-04-21 16:25:42 +03:00 |
|
|
|
00b2c032e4
|
Web: Files: fixed MainButton options
|
2022-04-21 16:15:20 +03:00 |
|
|
|
03c8921293
|
Web: Files: fixed FromGallery loader
|
2022-04-21 16:01:49 +03:00 |
|
|
|
9a204b536a
|
Web: Files: fixed MainButton formActions
|
2022-04-21 15:41:17 +03:00 |
|
|
|
ebbd473ecf
|
Web: fixed getOforms language
|
2022-04-21 15:33:48 +03:00 |
|
|
|
fe0db050ff
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-21 14:49:18 +03:00 |
|
|
|
41c505da8f
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 14:48:35 +03:00 |
|
|
|
596153ac21
|
Web:Studio:Fix reminderTest.
|
2022-04-21 14:47:18 +03:00 |
|
|
|
e7b4280df2
|
Web: Files: fixed getOforms
|
2022-04-21 14:38:14 +03:00 |
|
|
|
fff945cd18
|
Web: Files: fixed forms creation
|
2022-04-21 14:33:48 +03:00 |
|
|
|
95086e5d94
|
fix kafka settings
|
2022-04-21 14:06:32 +03:00 |
|
|
|
50d627e58c
|
Web: Files: fixed getOforms
|
2022-04-21 13:57:04 +03:00 |
|
|
|
5a1062b61b
|
Web: Files: fix translations
|
2022-04-21 13:42:38 +03:00 |
|
|
|
bef4af84c8
|
Web: People: ProfileInfo: fixed horizontal scroll
|
2022-04-21 13:27:48 +03:00 |
|
Timofey Boyko
|
e33ff6a576
|
Web:Client:Components: return --vh for ios devices
|
2022-04-21 13:06:47 +03:00 |
|
Timofey Boyko
|
7dbb4f225d
|
Web:Files:Home: close sort button dropdown when item clicked for tile view and second click on item changed sort desc
|
2022-04-21 12:40:15 +03:00 |
|
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Timofey Boyko
|
5ce250acd0
|
Web:Common:FilterInput: add backdrop when sort button is open and change sort desc on second click for sort button item
|
2022-04-21 12:35:10 +03:00 |
|
Eugene Kozyrev
|
ff7b192dbf
|
Change kafka-zookeeper projects language (#626)
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-04-21 12:06:15 +03:00 |
|
|
|
e83f02c143
|
Web: Files: fixed gallery styles
|
2022-04-21 12:06:05 +03:00 |
|
|
|
eb96f5586e
|
Web: Files: fixed gallery translations for info panel
|
2022-04-21 11:57:48 +03:00 |
|
|
|
524a8e4cac
|
Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery
|
2022-04-21 11:06:27 +03:00 |
|
|
|
b04f132cea
|
Web: Files: fixed gallery styles
|
2022-04-21 11:06:04 +03:00 |
|
|
|
2bf6dec41d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-04-21 10:53:58 +03:00 |
|
|
|
20ac091869
|
Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery
|
2022-04-21 10:50:35 +03:00 |
|
|
|
48416ec5f8
|
Web: Files: Fix borders on thumbnails, refactoring
|
2022-04-21 10:50:21 +03:00 |
|
|
|
8aa32c4717
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 10:29:57 +03:00 |
|
|
|
01ea9af926
|
Web: Files: fixed version history page
|
2022-04-21 10:29:49 +03:00 |
|
|
|
b4c6e550dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 18:31:08 +03:00 |
|
|
|
7a55486b71
|
Web:Common:Fix location.pathname.
|
2022-04-20 18:29:29 +03:00 |
|
|
|
03f24dacac
|
Web:Studio:Fix location.pathname.
|
2022-04-20 18:29:13 +03:00 |
|
|
|
49e50093bc
|
Web:Studio:Delete console.log.
|
2022-04-20 18:28:34 +03:00 |
|
|
|
d703edba81
|
Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming.
|
2022-04-20 18:26:23 +03:00 |
|
|
|
bcef47efa2
|
Web:Common:Added tenantAlias, setTenantAlias to SettingsStore.
|
2022-04-20 18:24:21 +03:00 |
|
