|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
DmitrySychugov
|
138721316a
|
Client: turned off SmartBanner in store, affected the height of the Main component
|
2023-10-13 17:10:19 +05:00 |
|
|
|
1f27ac0c28
|
Merge branch 'bugfix/ui' into bugfix/initial-skeleton
|
2023-10-13 11:11:56 +03:00 |
|
mushka-n
|
85b3315429
|
fix info-panel members
|
2023-10-12 18:36:17 +03:00 |
|
Akmal Isomadinov
|
9071e541db
|
Client: Fixed language change
|
2023-10-12 20:25:55 +05:00 |
|
|
|
7a6931ef58
|
Merge branch 'bugfix/ui' into bugfix/initial-skeleton
|
2023-10-12 16:13:53 +03:00 |
|
|
|
e29ed93d75
|
Common:Article: remove console log
|
2023-10-12 11:53:26 +03:00 |
|
|
|
1ca03afdeb
|
Client:Article: fix article loaders
|
2023-10-12 10:38:53 +03:00 |
|
|
|
d710c51e34
|
Client: fix first skeleton render (remove skeleton waterflow)
|
2023-10-12 10:19:19 +03:00 |
|
|
|
37f7850fe1
|
Common:AppLoader: remove useless section, add container
|
2023-10-12 10:17:15 +03:00 |
|
|
|
6caaf71d51
|
Web: Files: fixed translations
|
2023-10-11 18:27:50 +03:00 |
|
|
|
4bcc0ca03c
|
Web: Added click on icon without condition.
|
2023-10-11 16:19:43 +03:00 |
|
|
|
155fc5cbb4
|
Merge branch 'bugfix/ui' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-11 16:09:57 +03:00 |
|
|
|
52570ff7b5
|
Web: Added an icon if the info panel is open.
|
2023-10-11 16:09:29 +03:00 |
|
|
|
726223f86f
|
Web: Files: fixed members list
|
2023-10-11 14:05:31 +03:00 |
|
DmitrySychugov
|
5bc500a582
|
Client: fixed member list issues
|
2023-10-11 15:11:39 +05:00 |
|
|
|
a0b39ea239
|
Common:Article: add profile loader
|
2023-10-10 18:17:13 +03:00 |
|
|
|
0e6e0ba1dc
|
Common:Loaders: fix article folder loader
|
2023-10-10 17:55:41 +03:00 |
|
Viktor Fomin
|
f4a1c64a6b
|
Common: Navigation: fix
|
2023-10-10 13:25:16 +03:00 |
|
Viktor Fomin
|
5050eb006c
|
Common: Section: Header: delete useless
|
2023-10-10 13:24:45 +03:00 |
|
Viktor Fomin
|
b8754f4cd5
|
Common: add warning section
|
2023-10-10 13:24:32 +03:00 |
|
Akmal Isomadinov
|
82d4dfef5a
|
Client:MediaViewer Fixed loader
|
2023-10-10 12:30:13 +05:00 |
|
|
|
c256569374
|
Common:Article: fix
|
2023-10-09 18:20:17 +03:00 |
|
|
|
4d4cc1c34f
|
Common:Article: delete useless
|
2023-10-09 18:15:56 +03:00 |
|
|
|
e828403fae
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-09 18:09:32 +03:00 |
|
|
|
a30de71d4a
|
Common: fix article height
|
2023-10-09 18:09:26 +03:00 |
|
|
|
1a4546db78
|
Web: Common: fixed ProfileFooterLoader
|
2023-10-09 17:38:20 +03:00 |
|
|
|
40853ab8cd
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-09 17:20:15 +03:00 |
|
|
|
b4a3ec8e3f
|
Client: fix submenu top
|
2023-10-09 17:19:43 +03:00 |
|
|
|
4319713e75
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-09 18:02:36 +04:00 |
|
|
|
07cb18f02e
|
Added mobileMore media query const
|
2023-10-09 18:02:32 +04:00 |
|
|
|
459f52c472
|
Merge branch 'bugfix/ui' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-09 16:35:27 +03:00 |
|
|
|
427470fa0b
|
Web:Hidden menu in Archive navigation.
|
2023-10-09 16:35:24 +03:00 |
|
Subhonbek
|
32114f5c0e
|
uifix #63 fix scroll when select role user
|
2023-10-09 15:57:34 +03:00 |
|
|
|
9e3efc6966
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-09 15:32:22 +03:00 |
|
|
|
5fe40f886e
|
Client: fix window height after open virtual keybord on iphone\ipad
|
2023-10-09 15:32:14 +03:00 |
|
|
|
9022c915a1
|
Replaced hardcode to media querу consts
|
2023-10-09 14:53:15 +04:00 |
|
|
|
0a07c42639
|
Replaced hardcode to mobile media query const
|
2023-10-09 12:50:39 +04:00 |
|
|
|
183cfeb406
|
Replaced hardcode to tablet const
|
2023-10-09 11:59:51 +04:00 |
|
|
|
5df84c51a4
|
Web:Common: fix
|
2023-10-08 08:19:42 +03:00 |
|
|
|
faa092f386
|
Web:Common: apply new breakpoints
|
2023-10-08 07:48:55 +03:00 |
|
|
|
0070d36c03
|
Web:Common: apply new breakpoints
|
2023-10-08 06:49:26 +03:00 |
|
|
|
d7a848bcbe
|
Web:Common:Filter apply new layout breakpoints
|
2023-10-06 19:19:22 +03:00 |
|
|
|
2cbea040e2
|
Web:Common:Navigation: apply new layout breakpoints
|
2023-10-06 18:28:54 +03:00 |
|
|
|
4c84d49add
|
Web:Common:Section: apply new layout breakpoints
|
2023-10-06 18:03:39 +03:00 |
|
|
|
01103470da
|
Web:Common:Article: apply new layout breakpoints
|
2023-10-06 17:10:57 +03:00 |
|
|
|
79d87b04a0
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-06 15:29:49 +03:00 |
|
|
|
d17cd840df
|
Web: add currentDeviceType for store
|
2023-10-06 15:29:30 +03:00 |
|
|
|
76eb1b43cd
|
Replaced magic number 375
|
2023-10-06 16:24:26 +04:00 |
|
Akmal Isomadinov
|
1a41fc138c
|
Web:MediaViewer Fixed error message
|
2023-10-06 17:07:11 +05:00 |
|
|
|
fe106e09f6
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-06 15:11:44 +04:00 |
|
|
|
70011756a7
|
Fix media queries (replaced hugeMobile, smallTablet) by design
|
2023-10-06 15:11:39 +04:00 |
|
Viktor Fomin
|
da65004f0c
|
Common: Utils: add convertTime
|
2023-10-05 23:24:41 +03:00 |
|
|
|
f033e183f3
|
Web: Files: PublicRoom: added getPrimaryLink
|
2023-10-05 17:10:35 +03:00 |
|
|
|
fce7c162b2
|
Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-05 17:08:02 +04:00 |
|
|
|
091d363230
|
Replaced hardcode to const in media query
|
2023-10-05 17:07:57 +04:00 |
|
Viktor Fomin
|
850cdc0858
|
Merge branch 'bugfix/ui' of https://github.com/ONLYOFFICE/DocSpace-client into bugfix/ui
|
2023-10-05 16:01:42 +03:00 |
|
mushka-n
|
41445ab776
|
fixed double backdrop bug in info-panel
|
2023-10-05 15:18:41 +03:00 |
|
Viktor Fomin
|
df2fc50896
|
Common: InfoPanelStore: fix openSelfProfile
|
2023-10-05 14:32:27 +03:00 |
|
mushka-n
|
a22635b7a8
|
move to new repo model
|
2023-10-05 11:29:18 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
Akmal Isomadinov
|
bdddc705bb
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilterTypeEnum.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.Files/Core/Helpers/DocSpaceHelper.cs
|
2023-10-04 14:34:03 +05:00 |
|
|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
|
27ae382c4e
|
Changed path to buildtools
|
2023-10-03 11:45:09 +04:00 |
|
|
|
f188adc1e5
|
Web: Client: Fixed appsettings path
|
2023-10-02 14:16:20 +03:00 |
|
mushka-n
|
0de01527a5
|
moved all side methods to store + dark theme fix
|
2023-10-02 06:18:18 +03:00 |
|
|
|
44c6720b5d
|
Merge branch 'develop' into feature/creating-room-from-one-folder
|
2023-09-29 19:17:15 +04:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
|
87d0e7932a
|
Web: Files: Info-panel: fixed members list
|
2023-09-29 12:52:08 +03:00 |
|
|
|
520aa4d35f
|
Web:Client:Plugins: add system plugins
|
2023-09-29 12:22:05 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
mushka-n
|
a184219005
|
updated category filter structurization + removed from preview
|
2023-09-28 17:24:46 +03:00 |
|
Akmal Isomadinov
|
fde95139b7
|
Web:FormRoom Added folder type icon in info panel
|
2023-09-28 15:15:20 +05:00 |
|
|
|
635b134f93
|
Web: Fix path (ubuntu issue)
|
2023-09-28 14:04:20 +04:00 |
|
Viktor Fomin
|
cf2b15795a
|
Common: Loaders: fix
|
2023-09-28 12:34:01 +03:00 |
|
|
|
8d487cce45
|
Web: Fix path (ubuntu issue)
|
2023-09-28 11:52:58 +04:00 |
|
Akmal Isomadinov
|
07d22ee30c
|
Web: Added folder type
|
2023-09-27 16:27:04 +05:00 |
|
Akmal Isomadinov
|
bf05f042da
|
Web: Added icons
|
2023-09-27 13:15:44 +05:00 |
|
gazizova-vlada
|
ed5c8d0d76
|
Web:Common:Add argument content in method copyToFolder for copy only content inside folder.
|
2023-09-27 10:06:23 +03:00 |
|
|
|
47647180d1
|
Web: Files: hidden invited users from AddUsersPanel
|
2023-09-26 16:02:51 +03:00 |
|
|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
fe51f00a4f
|
Web: Files: fixed resendEmailInvitations
|
2023-09-25 17:07:25 +03:00 |
|
|
|
95b095a386
|
Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization
|
2023-09-25 16:37:45 +03:00 |
|
|
|
67bd4632ad
|
Web: Files: InviteInput: fixed search
|
2023-09-25 16:37:37 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
|
c0b36735dd
|
Web: Applied server changes in api
|
2023-09-25 16:28:31 +04:00 |
|
mushka-n
|
10f8b0e00a
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-25 14:25:46 +03:00 |
|
|
|
ee809f380d
|
Web: Files: fixed AddUsersPanel
|
2023-09-25 13:55:37 +03:00 |
|
mushka-n
|
75c7ff6a04
|
updated and implemented media viewer for oforms
|
2023-09-25 13:20:53 +03:00 |
|
Akmal Isomadinov
|
9d6ca027c8
|
Web:FormRoom: Added translation
|
2023-09-25 13:29:53 +05:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Akmal Isomadinov
|
d70c057848
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2023-09-25 10:40:22 +05:00 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
47715a37da
|
fixed category filter selected item title not changing
|
2023-09-23 22:07:49 +03:00 |
|
mushka-n
|
7e56891fe6
|
added template descripton fetching
|
2023-09-22 21:19:06 +03:00 |
|
mushka-n
|
6cbb1cce34
|
implemented new localization structure + after-merge fixes
|
2023-09-22 18:38:37 +03:00 |
|
|
|
c91a2dfc36
|
Web: Added new SettingsDSConnect loader
|
2023-09-22 17:09:07 +04:00 |
|
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
|
|
556ce3de0a
|
Web: Rename ids, param apiUrl to docServiceUrl and placeholder
|
2023-09-21 18:32:19 +04:00 |
|
Akmal Isomadinov
|
9cf396fbf7
|
Web: Added a form room icon
|
2023-09-21 19:29:53 +05:00 |
|
Akmal Isomadinov
|
41468fccd7
|
Web: Added Form room
|
2023-09-21 19:28:32 +05:00 |
|
|
|
35e40f617f
|
Web: Added get DocumentService location settings
|
2023-09-21 17:28:15 +04:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
d1c3bb66bb
|
Merge branch 'develop' into bugfix/fix-static-images
|
2023-09-20 19:53:29 +04:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
a061d42f29
|
Web:Add dataReassignmentUrl.
|
2023-09-20 17:03:31 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
gazizova-vlada
|
dd3e9d3363
|
Web:Client:Fix update accounts list after delete, delete dataReassignmentUrl.
|
2023-09-20 16:20:28 +03:00 |
|
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
|
4e588759d9
|
Web: Fix warning: Unsatisfied version 5.21.4 from @docspace/client of shared singleton module react-tooltip (required =5.21.1)
|
2023-09-20 14:50:03 +04:00 |
|
|
|
292f92e818
|
Web:Client: fix import images from image-helpers
|
2023-09-20 13:42:43 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
mushka-n
|
693a1bf02b
|
merge with develop (and submit-to-form-gallery)
|
2023-09-19 16:42:56 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
mushka-n
|
85423bd1dd
|
code cleanup
|
2023-09-19 13:56:34 +03:00 |
|
mushka-n
|
b5d23aaf62
|
added request canceling
|
2023-09-19 13:27:22 +03:00 |
|
mushka-n
|
b8ca2852e2
|
deleted unused logs
|
2023-09-19 12:51:36 +03:00 |
|
|
|
4e38a5a987
|
Web: Applied new formGallery config
|
2023-09-19 13:12:40 +04:00 |
|
mushka-n
|
2b58726b86
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-19 12:02:57 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
gazizova-vlada
|
f8d623d3ef
|
Web:Add dataReassignmentUrl.
|
2023-09-18 18:17:02 +03:00 |
|
mushka-n
|
2fd546f697
|
fixed formData naming
|
2023-09-18 17:09:14 +03:00 |
|
mushka-n
|
4a6b1b7f0d
|
tarnslations + link popup unblock
|
2023-09-18 14:28:25 +03:00 |
|
|
|
84f77d3b3d
|
Web: Files: removed someDialogIsOpen
|
2023-09-18 13:52:51 +03:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
mushka-n
|
2fa0561238
|
fixed submit method (no cors-anywhere)
|
2023-09-18 11:46:37 +03:00 |
|
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
mushka-n
|
c717324d37
|
applied submit method (temp cors-anywhere)
|
2023-09-15 18:42:24 +03:00 |
|
Viktor Fomin
|
5fc2677a2a
|
Common: MoreLoginModal: get Sign up label
|
2023-09-15 18:33:43 +03:00 |
|
Viktor Fomin
|
93581e8e63
|
Common: Utils: fix getProviderTranslation
|
2023-09-15 18:32:32 +03:00 |
|
|
|
a5662b7cdd
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-09-15 16:54:26 +03:00 |
|
|
|
9b261b72d6
|
Web:Common:MediaViewer: update context menu with plugins
|
2023-09-15 14:07:08 +03:00 |
|
gazizova-vlada
|
cf930e37bc
|
Web:Client:Fix id to userId.
|
2023-09-15 11:31:42 +03:00 |
|
gazizova-vlada
|
e205fb5d78
|
Web:Client:Add onTerminate.
|
2023-09-15 10:32:12 +03:00 |
|
mushka-n
|
a81c62a099
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-15 00:45:03 +03:00 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
mushka-n
|
6b9e132ae4
|
upload form update (need to test, no cors)
|
2023-09-15 00:39:43 +03:00 |
|
|
|
46c6454d88
|
Web:Common:Section: fix padding for tablet and mobile window size
|
2023-09-14 19:26:49 +03:00 |
|
Viktor Fomin
|
94e9cbb948
|
Common: add apple provider
|
2023-09-14 14:32:28 +03:00 |
|
|
|
f477080db2
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-14 13:20:17 +04:00 |
|
gazizova-vlada
|
6c3ee273b6
|
Web:Common:Add DataReassignmentLoader.
|
2023-09-13 18:38:37 +03:00 |
|
|
|
09b012d4e9
|
Web:Client: fix blinking trash navigation
|
2023-09-13 15:52:04 +03:00 |
|
|
|
410f5f6257
|
Web:Common:Navigation: delete useless
|
2023-09-13 11:50:52 +03:00 |
|
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
|
|
eebc415d81
|
Web: Common: Navigation: fixed public-room icon
|
2023-09-13 09:52:14 +03:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
mushka-n
|
b657d3731b
|
merge develop + merge fix
|
2023-09-12 02:13:05 +03:00 |
|
mushka-n
|
ae5f1d2287
|
fixed submit to gallery alert not showing up
|
2023-09-12 02:03:26 +03:00 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|
|
|
8d2a2526de
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-08 18:18:50 +02:00 |
|
|
|
60e7c125ad
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:55:35 +04:00 |
|
|
|
1e615924ae
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:36:25 +04:00 |
|
|
|
8196a60005
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-08 13:36:23 +02:00 |
|
Akmal Isomadinov
|
7051e55778
|
Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/DocSpace into feature/copy-paste-hotkeys
|
2023-09-08 15:28:00 +05:00 |
|
Akmal Isomadinov
|
15673efae5
|
Web:MediaViewer Added hot keys
|
2023-09-08 15:27:43 +05:00 |
|
|
|
5a76bd2bcf
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-08 12:05:20 +04:00 |
|
|
|
c5731bd8a8
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-08 11:28:42 +04:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Akmal Isomadinov
|
8dca5302af
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-07 18:46:47 +05:00 |
|
|
|
8ac6241c7e
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 17:13:02 +04:00 |
|
|
|
bf7e88da34
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-07 15:40:14 +03:00 |
|
|
|
29afb41deb
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-09-07 16:07:15 +04:00 |
|
Viktor Fomin
|
a99b036e87
|
Common: Article: fix
|
2023-09-07 12:57:22 +03:00 |
|
|
|
ed855b941f
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-07 11:07:00 +04:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
|
|
2b40130bce
|
Merge branch 'develop' into bugfix/backup
|
2023-09-06 10:51:25 +03:00 |
|
Akmal Isomadinov
|
6f8f34468c
|
Web: Updated tooltip
|
2023-09-05 14:14:37 +05:00 |
|
|
|
dc4b0275ec
|
Web: Added redirect only for rooms on error.
|
2023-09-05 10:38:00 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
83bc2edd02
|
Web: bump version to v1.1.3
|
2023-09-04 17:43:24 +04:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
613938b819
|
Web: Added Zoom login button, translates and icons
|
2023-09-04 16:06:55 +03:00 |
|
|
|
e9fcf067ee
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
|
2023-09-04 12:16:13 +03:00 |
|
Viktor Fomin
|
3f63a0b27c
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-02 01:07:54 +03:00 |
|
|
|
fa368adb4d
|
Merge pull request #1667 from ONLYOFFICE/bugfix/contextmenu-offset
bugfix/contextmenu-offset
|
2023-09-01 23:57:37 +04:00 |
|
|
|
001d2d313f
|
Merge pull request #1677 from ONLYOFFICE/bugfix/info-panel-toggle-button
Web:Common:Navigation: hide toggle button, when info panel is opened
|
2023-09-01 23:10:17 +04:00 |
|
|
|
d77e8a1771
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 16:42:08 +02:00 |
|
|
|
a952793dcb
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 17:03:04 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
b0cbe39aa6
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-01 16:47:52 +03:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
mushka-n
|
36aa3c52fe
|
fixed empty non-en categories
|
2023-08-31 23:48:13 +03:00 |
|
mushka-n
|
c2fae9ed4f
|
dynamic header + responsiveness tweaks
|
2023-08-31 22:56:26 +03:00 |
|
mushka-n
|
319ca7c465
|
fixed optimized filtering
|
2023-08-31 18:24:19 +03:00 |
|
|
|
c5b03c8aeb
|
Web: Login: Added captcha.
|
2023-08-31 15:39:57 +03:00 |
|
|
|
2f179bec9c
|
Web: SSO: Fix logout redirect
|
2023-08-31 14:33:29 +04:00 |
|
|
|
24278a2d6b
|
Web: Client: Setting: added new description of settings, fixed styles
|
2023-08-31 12:37:29 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
gazizova-vlada
|
566a5ce893
|
Web:Add link.
|
2023-08-30 18:34:47 +03:00 |
|
|
|
f2b1099d93
|
Web: Client: Common: remove manual rtl switching
|
2023-08-30 16:02:16 +02:00 |
|
|
|
2ced4328df
|
Web: updated react-i18next to v13
|
2023-08-30 15:08:56 +04:00 |
|
gazizova-vlada
|
9c9b43c51e
|
Web:Common:Fix.
|
2023-08-30 13:47:55 +03:00 |
|
gazizova-vlada
|
432429e0d6
|
Web:Rename LoginSettings in BruteForceProtection.
|
2023-08-30 12:13:05 +03:00 |
|
|
|
5e79ebe967
|
Added new language (ar-SA)
|
2023-08-30 12:03:34 +04:00 |
|
|
|
0242879692
|
Web:Common:Navigation: hide toggle button, when info panel is opened
|
2023-08-29 17:27:08 +03:00 |
|
|
|
1bad02933e
|
Fix bug 63802 - Settings: Deactivate: Removed unnecessary requests.
|
2023-08-29 17:13:05 +03:00 |
|
mushka-n
|
da2b50d74b
|
search filter
|
2023-08-29 14:49:35 +03:00 |
|
Subhonbek
|
2883754ca7
|
Update section-body.js
|
2023-08-29 13:11:58 +03:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
Subhonbek
|
7f3d66d7ea
|
web common fix srcroll padding
|
2023-08-29 12:36:35 +03:00 |
|
|
|
3e0910df17
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-29 09:56:40 +03:00 |
|
|
|
5d1101d755
|
Merge branch 'develop' into bugfix/trash-navigation
|
2023-08-29 09:42:55 +03:00 |
|
gazizova-vlada
|
2a171a0b5b
|
Web:Common:Fixed the lack of displaying an error when trying to login when all attempts have ended and there is a blocking.
|
2023-08-29 08:01:22 +03:00 |
|
Viktor Fomin
|
dec3a79423
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-08-29 06:31:34 +03:00 |
|
Viktor Fomin
|
1904e3bc43
|
Fix Bug 63467: auth via Microsoft is not available
|
2023-08-29 06:26:37 +03:00 |
|
|
|
752dd5880f
|
Web:Client:Navigation: fix for trash folder
|
2023-08-28 18:57:45 +03:00 |
|
|
|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
|
|
f956edb4d7
|
Web: Common: fix contextmenu offset on tablet and mobile screen sizes
|
2023-08-28 11:10:00 +02:00 |
|
|
|
1aedb58356
|
Web: PortalSettings: Restore: Added uploading files in parts.
|
2023-08-28 10:51:13 +03:00 |
|
mushka-n
|
79dea3bcd3
|
fix pagination
|
2023-08-28 01:57:38 +03:00 |
|
Mushka Nikita
|
d943935b2c
|
update on category filter + bugfixes
|
2023-08-25 23:40:23 +03:00 |
|
|
|
b9adaa8228
|
Web:Client:Plugin: fix withActiveItem context menu items
|
2023-08-25 12:37:29 +03:00 |
|
Viktor Fomin
|
573b8f96a4
|
Fix Bug 57787: The Interface theme option from the portal is not taken when changing the theme in Desktop Editors
|
2023-08-23 15:44:39 +03:00 |
|
Mushka Nikita
|
dee06aa519
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-08-23 00:57:25 +03:00 |
|
|
|
83d4daf9e1
|
Fixed Bug 63730 - Rooms: Tags. Refresh page with active tag 'xss' view to fall
|
2023-08-22 11:47:46 +03:00 |
|
Mushka Nikita
|
fe88c657de
|
merge develop + merge bugfix
|
2023-08-22 03:25:02 +03:00 |
|
Mushka Nikita
|
c148a8f55a
|
finised client-side, provided functionality for sort, locale and category filters. ip for category and search filters
|
2023-08-22 00:30:34 +03:00 |
|
Viktor Fomin
|
1d2479aec8
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-08-21 22:08:23 +03:00 |
|
|
|
c109f47267
|
Web: Editor: Client: Common: Replace rtl language to ltr in Editor
|
2023-08-21 14:48:28 +02:00 |
|
Subhonbek
|
92b6ddbb0a
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-21 15:28:57 +03:00 |
|
|
|
73d0c5d3d3
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-18 14:36:12 +03:00 |
|
|
|
c178c2d680
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-08-18 14:35:38 +03:00 |
|
|
|
42c009d160
|
Web: Common: fixed navigation icon
|
2023-08-18 14:03:30 +03:00 |
|
|
|
9c91b40ac7
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-18 11:03:10 +03:00 |
|
|
|
88a06cc8da
|
Merge branch 'hotfix/v1.1.2' into feature/csp
|
2023-08-17 17:38:35 +03:00 |
|
|
|
765559f55c
|
Web: Files: fixed rooms list
|
2023-08-17 15:00:22 +03:00 |
|
Viktor Fomin
|
2fa9a8b1ff
|
Common: Article: fix style
|
2023-08-17 11:49:36 +03:00 |
|
gazizova-vlada
|
fc6f692efa
|
Merge branch 'develop' into feature/login-settings
|
2023-08-16 15:14:14 +03:00 |
|
gazizova-vlada
|
09d039364c
|
Web:Common:Add Brute Force Protection setting methods.
|
2023-08-16 09:37:03 +03:00 |
|
|
|
c435658bcf
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/common/components/Loaders/DialogAsideLoader/StyledDialogAsideLoader.js
|
2023-08-15 17:07:51 +02:00 |
|
|
|
84a6a8db9d
|
Web:Client:Plugin: fix context menu items for Images, Video, Files for file list and viewer
|
2023-08-15 15:14:32 +03:00 |
|
|
|
c0995c2c03
|
Web: Files: fixed DialogAsideLoader
|
2023-08-15 10:41:46 +03:00 |
|
|
|
e19f2f4c12
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/login/src/client/components/ClientApp.tsx
|
2023-08-14 15:34:02 +02:00 |
|
|
|
576b6bc5ab
|
Web: Common: Fix RTL in custom.scss
|
2023-08-14 13:34:16 +02:00 |
|
|
|
b8038b466d
|
Web: SettingsStore: Fixed api links
|
2023-08-14 13:02:54 +03:00 |
|
|
|
482c646440
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-14 11:08:45 +03:00 |
|
|
|
012cc69ce0
|
Fix bug 63605 - Paid portal is not added to the list of connected ones if the payment is overdue on it.
|
2023-08-11 18:20:58 +03:00 |
|
|
|
67d71acc51
|
Web: Common: Fix RTL bugs in Navigation
|
2023-08-11 15:41:41 +02:00 |
|
|
|
2e9a4004e9
|
Web: Common: Fix RTL bugs in Navigation
|
2023-08-11 14:50:58 +02:00 |
|
|
|
493c16f5af
|
Merge branch 'develop' into feature/leave-room
|
2023-08-11 15:21:18 +03:00 |
|
|
|
e531654c54
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-08-11 12:47:44 +03:00 |
|
|
|
de78803f5e
|
Web: Common: Adapt TableRowLoader to RTL
|
2023-08-10 16:18:02 +02:00 |
|
