|
|
132bc6792b
|
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
|
2023-03-10 17:06:55 +03:00 |
|
|
|
95a35bcad3
|
Web: Returned request.
|
2023-03-10 16:35:20 +03:00 |
|
Viktor Fomin
|
49554ab65e
|
Client: Confirm: CreateUser: refactoring
|
2023-03-10 16:20:16 +03:00 |
|
Viktor Fomin
|
1b8d9c9664
|
Client: Confirm: fix layout style
|
2023-03-10 16:19:45 +03:00 |
|
|
|
234bb31ab9
|
Web: Fixed dates.
|
2023-03-10 16:16:12 +03:00 |
|
|
|
bd61c2c322
|
Web: Payments: Splitting a file into several.
|
2023-03-10 15:41:33 +03:00 |
|
Vashchuk Nikita
|
2d92da7c0c
|
Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
# web/ASC.Web.Api/GlobalUsings.cs
|
2023-03-10 17:39:47 +05:00 |
|
|
|
7f729cdf1b
|
Web: Refactoring.
|
2023-03-10 15:14:40 +03:00 |
|
|
|
bd54c11a81
|
Merge branch 'develop' into feature/notifications
|
2023-03-10 14:27:34 +03:00 |
|
|
|
10d5ebcbca
|
Web: Notifications: Deleted useless code.
|
2023-03-10 14:25:03 +03:00 |
|
|
|
9f390b7837
|
Web: Refactoring. added error handler.
|
2023-03-10 14:23:16 +03:00 |
|
|
|
a8350825bc
|
Web: Refactoring, added mute status update immediately.
|
2023-03-10 14:22:10 +03:00 |
|
|
|
e6b1cf82bd
|
Web: Notifications: Renaming.
|
2023-03-09 19:15:57 +03:00 |
|
|
|
ec3d8eb44b
|
Web: Deleted useless translations.
|
2023-03-09 19:13:22 +03:00 |
|
|
|
70f89faa78
|
Web:Client:Add sortByTitle for FilterInput.
|
2023-03-09 19:12:13 +03:00 |
|
|
|
66e26f076b
|
Web: Added error handler.
|
2023-03-09 19:05:27 +03:00 |
|
|
|
2d83a0df66
|
Web: Deleted useless translations.
|
2023-03-09 18:36:15 +03:00 |
|
|
|
8790582db2
|
Web: Deleted useless translation after merge.
|
2023-03-09 18:24:59 +03:00 |
|
|
|
0947e1d67a
|
Web: Deleted useless translation after merge.
|
2023-03-09 18:22:23 +03:00 |
|
|
|
7f3c2c5bb2
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-09 18:13:05 +03:00 |
|
|
|
de834ffa27
|
Web:Client:Change translations.
|
2023-03-09 18:12:58 +03:00 |
|
Viktor Fomin
|
9499aa6306
|
Client: PortalSettings: Whitelabel: fix reset, disabled
|
2023-03-09 18:11:02 +03:00 |
|
|
|
666a5775ea
|
Web:Client:Renamed actions in the main button.
|
2023-03-09 17:42:53 +03:00 |
|
Elyor Djalilov
|
5b282e02e1
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-09 16:30:47 +05:00 |
|
Elyor Djalilov
|
13dc3daac7
|
Web: Client: Profile: fix undefined value in session storage
|
2023-03-09 16:30:40 +05:00 |
|
|
|
c09340775d
|
Web: Files: fixed onClearFilter
|
2023-03-09 13:39:29 +03:00 |
|
|
|
14a6bceb86
|
Fixed Bug 61529 - Rooms.Archive. Fixed "Clear search" action
|
2023-03-09 13:36:50 +03:00 |
|
Elyor Djalilov
|
53919a72a2
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-09 13:47:09 +05:00 |
|
Elyor Djalilov
|
f75c2c7e08
|
Fix Bug 61043
|
2023-03-09 13:46:58 +05:00 |
|
|
|
4284fac1aa
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-09 11:46:45 +03:00 |
|
|
|
38332692bf
|
Web: MediaViewer: Removed scroll after media exit.
|
2023-03-09 11:46:26 +03:00 |
|
|
|
98d1106b32
|
Web: Section: Added when clicking on the name of a media file, the file is not selected.
|
2023-03-09 11:42:48 +03:00 |
|
Mushka Nikita
|
8f2e525b32
|
changed InfoPanel:ExpectUsers translationm key to "Pending invitations"
|
2023-03-09 11:39:06 +03:00 |
|
Mushka Nikita
|
43810c2526
|
Changed Files:Archived translation key to "Archive"
|
2023-03-09 11:23:04 +03:00 |
|
Mushka Nikita
|
208fa56a24
|
Fixed crash on several people selection
|
2023-03-09 11:15:41 +03:00 |
|
Vlada Gazizova
|
7c22c9d4fa
|
Merge pull request #1292 from ONLYOFFICE/bugfix/fix-duplicate
Web:Client:Fix deleting source file after duplication operation.
|
2023-03-07 16:59:53 +03:00 |
|
|
|
3acd390f2b
|
Merge pull request #1289 from ONLYOFFICE/bugfix/fix-back-button
Web:Client:Fix back button.
|
2023-03-07 13:30:36 +04:00 |
|
|
|
00e07ac1cb
|
Web:Client:Fix deleting source file after duplication operation.
|
2023-03-07 12:24:46 +03:00 |
|
|
|
fe70038a43
|
Web:Client:Fix.
|
2023-03-07 11:27:44 +03:00 |
|
|
|
517e7f16e0
|
Web:Client:Fix.
|
2023-03-07 11:24:21 +03:00 |
|
|
|
b5b9deb391
|
Web:Client:Fix isArchivedRoom.
|
2023-03-07 11:22:38 +03:00 |
|
|
|
b2a71ab158
|
Web:Client:Fix.
|
2023-03-07 10:57:12 +03:00 |
|
DmitrySychugov
|
5b6a107e3d
|
Web: Client: fixed clean timeout
|
2023-03-07 12:53:11 +05:00 |
|
|
|
bdd62c5a43
|
Merge branch 'develop' into bugfix/fixed-loader-blinking
|
2023-03-06 23:03:03 +04:00 |
|
|
|
6b2434eb28
|
Web:Client:Fix back button.
|
2023-03-06 18:05:23 +03:00 |
|
DmitrySychugov
|
daf38f640c
|
Web: Client: added a small delay to the loader so that there is no flickering
|
2023-03-06 19:06:57 +05:00 |
|
|
|
626bb741b5
|
Merge branch 'develop' into bugfix/61157
|
2023-03-06 17:34:37 +04:00 |
|
|
|
378407686c
|
Merge pull request #1287 from ONLYOFFICE/bugfix/additional-resources-buttons
Bugfix/additional resources buttons
|
2023-03-06 17:32:20 +04:00 |
|
|
|
29abce027d
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-03-06 15:37:45 +03:00 |
|
|
|
cbc8d7b2d5
|
Merge pull request #1286 from ONLYOFFICE/bugfix/fixed-files-upload
Web: Files: fixed files upload
|
2023-03-06 15:11:16 +03:00 |
|
|
|
668a1c6258
|
Web: Files: fixed conversion
|
2023-03-06 14:29:39 +03:00 |
|
|
|
90c9fa1a0c
|
Web:Client:Fix the lack of buttons if the settings are not paid.
|
2023-03-06 14:28:41 +03:00 |
|
|
|
a26384cc96
|
Web: Files: fixed files upload
|
2023-03-06 14:17:21 +03:00 |
|
|
|
977ef4f43a
|
Merge branch 'develop' into feature/send-again
|
2023-03-06 15:12:02 +04:00 |
|
|
|
8d45abeffe
|
Merge branch 'feature/send-again' of github.com:ONLYOFFICE/AppServer into feature/send-again
|
2023-03-06 13:21:45 +03:00 |
|
|
|
b219ebb07b
|
Web:Client:Fix styles.
|
2023-03-06 13:21:37 +03:00 |
|
|
|
43e465697d
|
Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed
|
2023-03-06 14:20:59 +04:00 |
|
Elyor Djalilov
|
b28f8e793b
|
Web: PortalSettings: fix backup fields
|
2023-03-06 14:43:16 +05:00 |
|
Elyor Djalilov
|
d4fd62e2ec
|
fix bad merge
|
2023-03-06 14:29:09 +05:00 |
|
Elyor Djalilov
|
fdaf0aa9e9
|
Merge branch 'develop' into bugfix/61157
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
|
2023-03-06 14:20:25 +05:00 |
|
|
|
83c03823aa
|
Fix confirmLink activeEmail
|
2023-03-06 12:35:49 +04:00 |
|
|
|
2a503cfc47
|
Merge branch 'develop' into feature/send-again
|
2023-03-06 10:59:42 +04:00 |
|
|
|
6cf2a16c39
|
Merge branch 'develop' into feature/send-again
|
2023-03-05 12:18:02 +03:00 |
|
|
|
bfeda8f9e9
|
Web:Client:Fixed styles because the send link again did not fit in the plate.
|
2023-03-05 12:17:42 +03:00 |
|
|
|
b341ddfb62
|
Fix socket operations
|
2023-03-05 11:39:44 +04:00 |
|
Elyor Djalilov
|
44c04c5131
|
Web: PortalSettings: fix appearance color
|
2023-03-04 19:44:39 +05:00 |
|
Elyor Djalilov
|
668be2e17d
|
Web: PortalSettings: fix single sign-on fields
|
2023-03-04 13:10:53 +05:00 |
|
Elyor Djalilov
|
4cecc2c3a9
|
Web: PortalSettings: fix styles
|
2023-03-04 11:36:04 +05:00 |
|
Elyor Djalilov
|
728ba4ea5b
|
Web: PortalSettings: fix automatic backup fields
|
2023-03-04 11:19:06 +05:00 |
|
Elyor Djalilov
|
6ded261462
|
Web: PortalSettings: fix company logos
|
2023-03-04 10:18:44 +05:00 |
|
|
|
c91f6c9e5d
|
Merge branch 'develop' into feature/fix-back-button-rooms
|
2023-03-03 18:03:29 +04:00 |
|
|
|
964300cd19
|
Merge branch 'develop' into bugfix/oforms-context-info
|
2023-03-03 17:02:35 +04:00 |
|
|
|
68ce5c8764
|
Merge branch 'bugfix/settings-backup' of github.com:ONLYOFFICE/AppServer into bugfix/settings-backup
|
2023-03-03 14:46:21 +03:00 |
|
|
|
f4d8972358
|
Web: Renaming.
|
2023-03-03 14:46:01 +03:00 |
|
|
|
8acbf0bd64
|
Merge branch 'develop' into bugfix/settings-backup
|
2023-03-03 15:23:05 +04:00 |
|
Mushka Nikita
|
bc2eda8a4c
|
fiixed erasure sorting
|
2023-03-03 14:21:25 +03:00 |
|
Mushka Nikita
|
00d44aad43
|
added russian translation to erasure functionality
|
2023-03-03 14:21:17 +03:00 |
|
Viktor Fomin
|
b2edb13072
|
Client: AccountsHome: add ResetApplicationDialog
|
2023-03-03 14:03:32 +03:00 |
|
Viktor Fomin
|
c7aa870767
|
Client: init reset auth
|
2023-03-03 14:03:02 +03:00 |
|
Viktor Fomin
|
4d60816027
|
Client: ResetApplicationDialog: add success toast
|
2023-03-03 14:01:10 +03:00 |
|
Viktor Fomin
|
c6e1c58e97
|
Client: add translates
|
2023-03-03 14:00:53 +03:00 |
|
Mushka Nikita
|
5171aeceb8
|
fiixed infoPanel closing on category switch
|
2023-03-03 13:34:03 +03:00 |
|
|
|
3448048b2b
|
Web: PortalSettings: Restore: Deleted useless code.
|
2023-03-03 13:06:21 +03:00 |
|
|
|
d49f5ead91
|
Web: PortalSettings: Deleted useless code.
|
2023-03-03 12:56:38 +03:00 |
|
|
|
f8000cdc2a
|
Web: PortalSettings: Backup: Fixed component display by direct url.
|
2023-03-03 12:54:22 +03:00 |
|
|
|
23b5689205
|
Web:Client:Fix.
|
2023-03-03 11:17:58 +03:00 |
|
Timofey Boyko
|
f4f7a1b3ad
|
Web:Client: move FilterGroups and FilterKeys constants to common
|
2023-03-03 11:05:26 +03:00 |
|
|
|
00e385f193
|
Web:Client:Fixed repeated push of the same url in Customization settings.
|
2023-03-03 10:47:07 +03:00 |
|
|
|
8e025f4afb
|
Web:Client:Fixed the lack of highlighting of the portal settings menu items when clicking back in the browser. Fixed substitution of the URL of the customization page when going to the branding page when there was a direct link download of the appearance page.
|
2023-03-03 10:12:00 +03:00 |
|
|
|
43dcb4dcd7
|
Web: Added clear storage.
|
2023-03-03 09:55:44 +03:00 |
|
|
|
0f22feed6e
|
Merge branch 'develop' into bugfix/fixed-render-list
|
2023-03-02 19:59:01 +04:00 |
|
|
|
655add486d
|
Hide ResetAuth option
|
2023-03-02 19:56:38 +04:00 |
|
|
|
4eed07ffe1
|
Hide concole
|
2023-03-02 19:51:27 +04:00 |
|
|
|
fb101bfabe
|
Web: Files: fixed moveToCopyTo operation
|
2023-03-02 18:39:23 +03:00 |
|
|
|
baed7a67aa
|
Web:Client:Remove unnecessary code since the handling of the popstate event is in the submenu.
|
2023-03-02 18:23:53 +03:00 |
|
|
|
b59aec3807
|
Web: PortalSettings: Backup: Delete useless code.
|
2023-03-02 17:59:33 +03:00 |
|
Timofey Boyko
|
0f82f5436a
|
Web:Client:MainBar: delete useless code
|
2023-03-02 17:24:01 +03:00 |
|
Timofey Boyko
|
ad2398ddd0
|
Web:Client:Profile: fix double invite request
|
2023-03-02 17:22:50 +03:00 |
|
Timofey Boyko
|
d8e2b2c03a
|
Merge branch 'develop' into bugfix/accounts-filter
|
2023-03-02 17:16:30 +03:00 |
|
Mushka Nikita
|
da794c6a0f
|
Merge branch 'bugfix/oforms-context-info' of github.com:ONLYOFFICE/AppServer into bugfix/oforms-context-info
|
2023-03-02 16:50:33 +03:00 |
|
Mushka Nikita
|
0569c1faab
|
fixed styling in info-panel accounts empty view
|
2023-03-02 16:50:18 +03:00 |
|
Mushka Nikita
|
caeaf69406
|
fixed accounts home header-container styling
|
2023-03-02 16:49:32 +03:00 |
|
|
|
2da50109bb
|
Merge branch 'develop' into bugfix/oforms-context-info
|
2023-03-02 17:37:51 +04:00 |
|
|
|
a4d3ff43bf
|
Merge branch 'develop' into bugfix/mobile-loader
|
2023-03-02 17:26:32 +04:00 |
|
|
|
bdb784b250
|
Merge pull request #1264 from ONLYOFFICE/bugfix/avatar-size
Web:Client:Removed the transfer of the size of the avatar so that the…
|
2023-03-02 17:18:27 +04:00 |
|
Timofey Boyko
|
477015697d
|
Web:Client:MainBar: fix link style
|
2023-03-02 16:17:35 +03:00 |
|
Viktor Fomin
|
ba81ad25b9
|
Merge branch 'develop' into bugfix/mobile-loader
|
2023-03-02 16:13:00 +03:00 |
|
|
|
b47ed9ea40
|
Merge branch 'develop' into bugfix/Bug61218
|
2023-03-02 17:08:47 +04:00 |
|
|
|
1a73aa630e
|
Merge pull request #1270 from ONLYOFFICE/bugfix/fixed-cancel-upload
Web: Files: fixed cancel upload
|
2023-03-02 17:03:21 +04:00 |
|
|
|
7ea61d3c5b
|
Web:Client:Added popstate event handling for accounts and settings.
|
2023-03-02 16:01:11 +03:00 |
|
Timofey Boyko
|
6fcabb5e2b
|
Web:Client:Profile: fix styles for main-profile
|
2023-03-02 15:56:27 +03:00 |
|
|
|
cad06d79a1
|
Web: Client: InviteLinksStore: Added runInAction for getting links action
|
2023-03-02 15:39:34 +03:00 |
|
Viktor Fomin
|
fbcd2500fe
|
Merge branch 'develop' into bugfix/mobile-loader
|
2023-03-02 15:03:31 +03:00 |
|
Viktor Fomin
|
12109ee711
|
Merge branch 'develop' into bugfix/Bug61218
|
2023-03-02 15:03:18 +03:00 |
|
Viktor Fomin
|
e498f32200
|
Client: Shell: delete useless
|
2023-03-02 14:49:08 +03:00 |
|
|
|
c6cdd69be1
|
Web: TreeFolders: Deleted error.
|
2023-03-02 14:24:32 +03:00 |
|
|
|
2bdaaa9b09
|
Web: PortalSettings: Backup: Fixed translation.
|
2023-03-02 14:10:48 +03:00 |
|
|
|
74b19e27f2
|
Web: Files: fixed cancel upload
|
2023-03-02 13:54:05 +03:00 |
|
Mushka Nikita
|
27a2f8a330
|
refactored ws modify-folder
|
2023-03-02 13:37:38 +03:00 |
|
Viktor Fomin
|
0dbcec1fe6
|
Merge branch 'develop' into bugfix/Bug61218
|
2023-03-02 13:35:50 +03:00 |
|
Viktor Fomin
|
e7043b3f8d
|
Client: HOCs: withLoader: fix mobile loader
|
2023-03-02 13:35:37 +03:00 |
|
|
|
f3675ee897
|
Merge branch 'develop' into bugfix/redesign-author-filter
|
2023-03-02 13:05:11 +04:00 |
|
|
|
0b88e40b0e
|
Web: Files: fixed removeFiles
|
2023-03-02 11:51:12 +03:00 |
|
|
|
765abfb554
|
Merge branch 'develop' into feature/fix-back-button-rooms
|
2023-03-02 11:05:14 +03:00 |
|
|
|
4fef567cca
|
Web:Client:Adding popstate event handling.
|
2023-03-02 11:01:28 +03:00 |
|
|
|
74eeff430b
|
Web:Client:Removing popstate event handling. Adding the onClickBack function from the store.
|
2023-03-02 11:00:42 +03:00 |
|
|
|
c6ef965306
|
Web:Client:Fixing the onClickBack function when the back button is clicked. Moving functions to storage. Added an id definition for the backToParentFolder function.
|
2023-03-02 10:59:08 +03:00 |
|
|
|
411195264f
|
Web:Client:Adding a url check to avoid pushing the same url into history.
|
2023-03-02 10:54:42 +03:00 |
|
|
|
80437509cc
|
Web:Client:Removing re-adding the url to the history when clicking on the menu items.
|
2023-03-02 10:53:44 +03:00 |
|
|
|
fa12ff1b56
|
Web:Client:Add new constants Settings and Accounts. Fix for incorrect definition of categoryType for Trash. Adding a categoryType definition for Settings and Accounts.
|
2023-03-02 10:52:22 +03:00 |
|
Timofey Boyko
|
98bf25f105
|
Merge branch 'develop' into bugfix/accounts-filter
|
2023-03-02 10:20:12 +03:00 |
|
|
|
ce34065a9e
|
Web:Client:Removed the transfer of the size of the avatar so that the picture is not cropped.
|
2023-03-02 08:42:04 +03:00 |
|
Viktor Fomin
|
6ca3170843
|
Fix Bug 61218: get keepNewFileName from server
|
2023-03-02 01:22:25 +03:00 |
|
DmitrySychugov
|
ce9e972d22
|
Merge branch 'develop' into bugfix/redesign-author-filter
|
2023-03-01 20:16:52 +05:00 |
|
DmitrySychugov
|
d030c658bb
|
Web: Client: fixed subjectId room filter for new filter design
|
2023-03-01 20:15:24 +05:00 |
|
Mushka Nikita
|
003826d581
|
testing code cleanup
|
2023-03-01 17:56:11 +03:00 |
|
Mushka Nikita
|
839a406615
|
Merge branch 'develop' into bugfix/oforms-context-info
|
2023-03-01 17:54:49 +03:00 |
|
Viktor Fomin
|
47172aad39
|
Client: Components: MainButton: fix missing main button
|
2023-03-01 17:49:45 +03:00 |
|
Mushka Nikita
|
518533656a
|
fixed members role combobx interaction with scroll
|
2023-03-01 17:34:09 +03:00 |
|
Mushka Nikita
|
5ca628cc84
|
added some filesCount and foldersCount update to modify-folder socket functionality
|
2023-03-01 17:29:48 +03:00 |
|
Timofey Boyko
|
7af2d9040c
|
Web:Accounts: fix filter for pending user
|
2023-03-01 17:09:31 +03:00 |
|
Timofey Boyko
|
691e80941c
|
Web:Client:InvitePanel: add filter for getUserList method
|
2023-03-01 15:36:42 +03:00 |
|
Timofey Boyko
|
86e158469b
|
Merge branch 'develop' into bugfix/accounts-list
|
2023-03-01 15:18:07 +03:00 |
|
Timofey Boyko
|
1150f512e7
|
Web:Client:InfoPanel: fix tooltip for DocSpace owner
|
2023-03-01 15:17:26 +03:00 |
|
Timofey Boyko
|
c8ccbe0a0e
|
Web:Client:InvitePanel: get user list after invite new users
|
2023-03-01 15:14:57 +03:00 |
|
Timofey Boyko
|
b97ed4a10e
|
Web:Client:Accounts: disable change user type for disabled users
|
2023-03-01 14:58:28 +03:00 |
|
Vlada Gazizova
|
b8d742599a
|
Merge branch 'develop' into feature/open-location
|
2023-03-01 11:37:31 +03:00 |
|
Timofey Boyko
|
a6561df0a0
|
Merge branch 'develop' into bugfix/chage-user-type
|
2023-03-01 11:24:10 +03:00 |
|
Timofey Boyko
|
65850ca29e
|
Fixed Bug 61322 and Bug 61324
|
2023-03-01 11:21:59 +03:00 |
|
|
|
f1e9c000fc
|
Merge pull request #1243 from ONLYOFFICE/bugfix/fixed-files-conversion
Web: Files: fixed conversion
|
2023-03-01 11:18:13 +03:00 |
|
