|
|
d586b39791
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 13:20:54 +04:00 |
|
|
|
4861aef38e
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 13:20:42 +04:00 |
|
|
|
5e5572db2c
|
Fix NotFoundKeysTest issue (Removed usage of AdvantageEditor, AdvantagePrivateRooom, AdvantageWebEditors and AdvantageUpdates keys)
|
2023-03-14 13:20:32 +04:00 |
|
Mushka Nikita
|
faaac15b37
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 12:20:26 +03:00 |
|
Mushka Nikita
|
7d688d3841
|
refactored infoPanel styling
|
2023-03-14 12:20:10 +03:00 |
|
|
|
c1d4b91419
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 12:20:07 +03:00 |
|
|
|
074033d200
|
Web: PortalSettings: Payments: Deleted useless code.
|
2023-03-14 12:19:53 +03:00 |
|
|
|
cb864b23be
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 13:11:22 +04:00 |
|
|
|
898a734a2f
|
Fix NotFoundKeysTest issue (Payments key)
|
2023-03-14 13:11:12 +04:00 |
|
|
|
fc4167cad8
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 12:02:25 +03:00 |
|
|
|
9811bceef4
|
Web: Files: fixed info-panel title
|
2023-03-14 11:43:29 +03:00 |
|
|
|
6f0f0ef2a5
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-14 11:40:22 +03:00 |
|
|
|
ebed98a537
|
Web:Client:Fix title in infoPanel.
|
2023-03-14 11:40:14 +03:00 |
|
|
|
2edbe1cb3f
|
Web: Added display of a dialog when creating a room during the grace period of the portal.
|
2023-03-14 10:33:08 +03:00 |
|
|
|
5197dfae86
|
Fix NotFoundKeysTest issue (Removed usage of CustomNewDepartment key)
|
2023-03-14 11:27:36 +04:00 |
|
|
|
88060f9ca5
|
Fix NotFoundKeysTest issue (Removed usage of ReassignmentData key)
|
2023-03-14 11:22:02 +04:00 |
|
|
|
a0b92eb114
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 09:48:28 +03:00 |
|
|
|
39ce5dd016
|
Web: Fixed info panel opening.
|
2023-03-14 09:47:41 +03:00 |
|
|
|
db4c561798
|
Web: Fixed 'ru' translation.
|
2023-03-14 09:27:27 +03:00 |
|
|
|
7a22d71642
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-13 18:17:15 +03:00 |
|
|
|
7b305cc518
|
Web:Client:Delete duplicate translation.
|
2023-03-13 18:17:03 +03:00 |
|
|
|
485abb701f
|
Web: Files: fixed tile view
|
2023-03-13 17:34:32 +03:00 |
|
|
|
89f51ab20a
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-13 17:30:52 +03:00 |
|
|
|
d9943ab255
|
Web: Files: fixed moveToCopyTo
|
2023-03-13 17:30:38 +03:00 |
|
|
|
755af4f544
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 17:25:31 +03:00 |
|
|
|
696b6504fc
|
Web: Hid upgrade button in dialog for room admin.
|
2023-03-13 17:23:36 +03:00 |
|
|
|
ac0f8feae9
|
Web: Added portal grace period warning modal dialog when inviting users.
|
2023-03-13 17:05:58 +03:00 |
|
|
|
918ccb1bf6
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-13 16:53:41 +03:00 |
|
|
|
1cd8e14763
|
Web:Client:Fixed the definition of the time zone in active sessions by the location of the user and not the portal.
|
2023-03-13 16:53:31 +03:00 |
|
|
|
46fa21c57f
|
Web: Changed translation.
|
2023-03-13 15:34:49 +03:00 |
|
|
|
4cdf6b0ac9
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 15:22:14 +03:00 |
|
|
|
5a99889f9d
|
Web: Added the number of days left before the grace period expires, changed translation.
|
2023-03-13 15:21:53 +03:00 |
|
|
|
51228a34c9
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 15:58:11 +04:00 |
|
|
|
64436d915d
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 14:36:12 +03:00 |
|
|
|
11c133af7f
|
Web: Added translation.
|
2023-03-13 14:36:02 +03:00 |
|
|
|
91943124ac
|
Fix NotFoundKeysTest issue (Removed usage of SendInvitesAgain and ImportPeople keys)
|
2023-03-13 15:23:36 +04:00 |
|
|
|
066da1dfd0
|
Fix NotFoundKeysTest issue (Restore InviteLinkTitle key)
|
2023-03-13 15:17:54 +04:00 |
|
|
|
543b8a79d2
|
Fix UselessTranslationKeysTest issue (Remove WizardTitle key)
|
2023-03-13 15:02:02 +04:00 |
|
|
|
8758140ae6
|
Fix UselessTranslationKeysTest issue (Remove UploadToFolder key)
|
2023-03-13 15:00:30 +04:00 |
|
|
|
4719c48604
|
Fix UselessTranslationKeysTest issue (Added usage of RoomNotificationsDisabled key)
|
2023-03-13 14:55:52 +04:00 |
|
|
|
d09f0bfe18
|
Fix UselessTranslationKeysTest issue (Added usage of PortalIntegration key)
|
2023-03-13 14:52:53 +04:00 |
|
|
|
2c5f2093fa
|
Fix UselessTranslationKeysTest issue (Change usage of MoveToTrashFolderFromPersonal and MoveToTrashFolderFromPersonal keys)
|
2023-03-13 14:36:24 +04:00 |
|
|
|
d42b889c30
|
Fix UselessTranslationKeysTest issue (Change usage of MoveToTrashFile and MoveToTrashFolder keys)
|
2023-03-13 14:35:00 +04:00 |
|
|
|
b99c821d38
|
Fix UselessTranslationKeysTest issue (Remove MediaLoadError key)
|
2023-03-13 14:32:45 +04:00 |
|
|
|
0c2faa4e74
|
Fix UselessTranslationKeysTest issue (Remove ForbiddenPageHeader key)
|
2023-03-13 14:30:54 +04:00 |
|
|
|
af90fdb084
|
Fix UselessTranslationKeysTest issue (Remove ForbiddenPageDescription key)
|
2023-03-13 14:29:55 +04:00 |
|
|
|
7ce506836e
|
Fix UselessTranslationKeysTest issue (Remove ErrorParamsTitle key)
|
2023-03-13 14:28:10 +04:00 |
|
|
|
9bc4fac559
|
Fix UselessTranslationKeysTest issue (Remove ErrorParamsBody key)
|
2023-03-13 14:26:52 +04:00 |
|
|
|
012d95efb3
|
Fix UselessTranslationKeysTest issue (Remove ErrorLicenseTitle key)
|
2023-03-13 14:25:29 +04:00 |
|
|
|
1eabeb237f
|
Fix UselessTranslationKeysTest issue (Remove ErrorLicenseRead key)
|
2023-03-13 14:24:07 +04:00 |
|
|
|
670125fe32
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 12:34:46 +03:00 |
|
|
|
d8281d940e
|
Web: Added translation for unexpected error.
|
2023-03-13 12:33:29 +03:00 |
|
|
|
b77f0ac9f5
|
Fix UselessTranslationKeysTest issue (Remove EnterPath key)
|
2023-03-13 13:24:34 +04:00 |
|
|
|
af423e2047
|
Fix UselessTranslationKeysTest issue (Change usage of DeleteFile and DeleteFolder keys)
|
2023-03-13 13:23:15 +04:00 |
|
|
|
1dd7df9951
|
Fix UselessTranslationKeysTest issue (Remove ChangeEmailTitle key)
|
2023-03-13 13:20:41 +04:00 |
|
|
|
b47ed2642f
|
Fix UselessTranslationKeysTest issue (Remove AddMembers key)
|
2023-03-13 13:19:09 +04:00 |
|
|
|
71b44b2cbc
|
Fix EmptyValueKeysTest issue (removed useless key DownloadReportBtn)
|
2023-03-13 13:05:27 +04:00 |
|
|
|
0df0b35782
|
Fix NotAllLanguageTranslatedTest issue (+ sorting)
|
2023-03-13 12:58:52 +04:00 |
|
|
|
7420a2a25a
|
Web: Removed number substitution in translation.
|
2023-03-13 11:57:19 +03:00 |
|
|
|
d1c766c6fc
|
Fix FullEnDublicatesTest issues (Archive/to archive)
|
2023-03-13 12:56:29 +04:00 |
|
|
|
bb48ec204a
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-13 11:53:36 +03:00 |
|
|
|
6bb831bd45
|
Web:Client:Fix language combo box styles.
|
2023-03-13 11:53:23 +03:00 |
|
|
|
9762e4eaca
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 11:45:30 +03:00 |
|
|
|
805f258e97
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 12:38:41 +04:00 |
|
|
|
80f2f03638
|
Fix EnDublicatesByContentTest issue (Payments)
|
2023-03-13 12:38:31 +04:00 |
|
Timofey Boyko
|
5b07dfb502
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 11:33:41 +03:00 |
|
Timofey Boyko
|
f084a463a2
|
Web:Client:Profile: add tooltip for not verified email
|
2023-03-13 11:33:31 +03:00 |
|
|
|
4bb0bc9d1c
|
Web: Change version to v1.0.0
|
2023-03-13 12:19:48 +04:00 |
|
|
|
6b2e5868a4
|
Web: PortalSettings: Payments: Fixed styles.
|
2023-03-13 11:18:28 +03:00 |
|
Timofey Boyko
|
8a27f241d7
|
Web:Client:Profile: fix styles
|
2023-03-13 11:16:20 +03:00 |
|
|
|
1365901bac
|
Merge branch 'release/v1.0.0' into bugfix/payments-page
|
2023-03-11 00:26:01 +04:00 |
|
Viktor Fomin
|
00e3e50876
|
Client: Confirm: CreateUser: add greeting mode
|
2023-03-10 20:31:04 +03:00 |
|
|
|
bc68d350bf
|
Merge branch 'release/v1.0.0' into bugfix/payments-page
|
2023-03-10 19:41:04 +04:00 |
|
|
|
0bfb51b5f7
|
Web: Added quota request after adding rooms and users.
|
2023-03-10 18:37:47 +03:00 |
|
|
|
122f9065dc
|
Web: Added errors handler, getting link was moved to init function.
|
2023-03-10 18:25:24 +03:00 |
|
|
|
26dd6c28f0
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-03-10 17:23:23 +03:00 |
|
|
|
f5b56ec6db
|
Web:Client:Add props showDisabledItems.
|
2023-03-10 17:23:16 +03:00 |
|
|
|
511c9d0bef
|
Web: Added error handler.
|
2023-03-10 17:09:03 +03:00 |
|
|
|
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 |
|
