Vladimir Khvan
|
f6c78f3ad8
|
20x20 data import icon was added
|
2023-11-23 21:03:14 +05:00 |
|
Vladimir Khvan
|
caa7c632c4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/Settings.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/components/table-container/TableHeaderCell.js
public/locales/en/Common.json
|
2023-11-22 19:45:10 +05:00 |
|
|
|
ef5428e3b2
|
Fixed image-helpers imports
|
2023-11-17 16:49:24 +03:00 |
|
|
|
45d74b5fe2
|
Added icons for file formats: sxc, et, ett, sxi, dps, dpt, sxw, stw, wps, wpt, mhtml
|
2023-11-16 16:35:22 +03:00 |
|
|
|
1afc4b423a
|
Renamed parameter
|
2023-11-10 22:56:02 +04:00 |
|
|
|
65bf52310b
|
Merge branch 'release/v2.0.0' into bugfix/portal-restriction
|
2023-11-10 22:47:44 +04:00 |
|
|
|
083e47b7f6
|
Merge branch 'release/v2.0.0' into bugfix/64907
# Conflicts:
# packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
|
2023-11-10 14:55:00 +01:00 |
|
|
|
26acdbbc55
|
Web: Client: Update time format for Saudi Arabia
|
2023-11-10 14:52:39 +01:00 |
|
|
|
b13befdea2
|
Web: Exceptions have been made for some API methods for redirection.
|
2023-11-10 13:58:27 +03:00 |
|
|
|
467696c675
|
Web: Fixed error for selector.
|
2023-11-07 10:32:37 +03:00 |
|
|
|
aa301a5583
|
Merge branch 'release/v2.0.0' into bugfix/file-badges
|
2023-11-03 21:34:48 +04:00 |
|
|
|
e78e69c77e
|
Update socket.js
|
2023-11-03 00:28:32 +04:00 |
|
|
|
db5c1223e9
|
Fix backup-restore (roomParts of undefined issue)
|
2023-11-03 00:15:15 +04:00 |
|
Aleksandr Lushkin
|
9308ee0fbe
|
Fix Bug 64907 - Accounts: Replace islamic dates with gregorian
|
2023-11-02 16:50:42 +01:00 |
|
Akmal Isomadinov
|
1d8e4852eb
|
Merge branch 'release/v2.0.0' into bugfix/file-badges
# Conflicts:
# packages/components/row/index.js
|
2023-11-02 17:31:31 +05:00 |
|
|
|
53ae6fa0b2
|
Web: fixed Request-Token
|
2023-11-02 14:40:32 +03:00 |
|
mushka-n
|
19ffe45e94
|
changed convertToLanguage method
|
2023-11-01 19:23:15 +03:00 |
|
mushka-n
|
da4c667afe
|
major code cleanup
|
2023-11-01 12:29:49 +03:00 |
|
Akmal Isomadinov
|
f8a5130221
|
Web:Common Fixed types
|
2023-10-31 22:26:55 +05:00 |
|
|
|
f9dfc3954b
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-31 18:18:20 +04:00 |
|
Akmal Isomadinov
|
46fac4a6e7
|
Web:Catalog Fixed type and refactoring
|
2023-10-30 20:06:09 +05:00 |
|
|
|
c3cd684a0d
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 18:34:09 +04:00 |
|
|
|
83c00a7eaa
|
Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0
|
2023-10-30 15:19:30 +03:00 |
|
|
|
96e56f2245
|
Common:Axios: fix 403 error after fetch folder into files selector
|
2023-10-30 15:19:21 +03:00 |
|
mushka-n
|
6d7a8127dd
|
updated mobile view of oform gallery filters and oform context menu
|
2023-10-30 13:47:31 +03:00 |
|
|
|
0b8fb9a38e
|
Client: rename
|
2023-10-30 13:46:05 +03:00 |
|
|
|
1eb8ba7ca8
|
Client: move socketSubscribersId from store to socketHelper
|
2023-10-30 13:22:06 +03:00 |
|
|
|
e0be82a102
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 12:05:09 +04:00 |
|
Akmal Isomadinov
|
561f7e6793
|
Web:settings: Fixed the icons of the settings
|
2023-10-27 18:39:46 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
|
|
3a1a46f692
|
Fixed Bug 57821. Added detect ui theme for Desktop Editors. Added change tab color for Desktop Editors
|
2023-10-26 14:43:39 +03:00 |
|
mushka-n
|
93fab6927c
|
fixed locales parsing
|
2023-10-25 10:38:01 +03:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +03:00 |
|
Viktor Fomin
|
b720a55bb0
|
Common: fix
|
2023-10-18 18:58:46 +03:00 |
|
|
|
dc3bc59641
|
Merge pull request #28 from ONLYOFFICE/bugfix/64384
bugfix/64384
|
2023-10-18 18:54:26 +04:00 |
|
Viktor Fomin
|
40dbcaa470
|
Common: Utils: LoginUtils: fix
|
2023-10-18 14:36:57 +03:00 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +03:00 |
|
Viktor Fomin
|
d0a29fc5a3
|
Fix Bug 64384
|
2023-10-18 14:19:22 +03:00 |
|
Vladimir Khvan
|
ea7b067e7f
|
Merge branch 'develop' into 'feature/data-migration' | conflict components/paging/styled-paging.js
|
2023-10-16 20:09:10 +05:00 |
|
Akmal Isomadinov
|
9071e541db
|
Client: Fixed language change
|
2023-10-12 20:25:55 +05:00 |
|
Viktor Fomin
|
da65004f0c
|
Common: Utils: add convertTime
|
2023-10-05 23:24:41 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
|
|
477976da29
|
Revert "Merge branch 'develop' into feature/oauth2-client"
This reverts commit 9d93525a91.
|
2023-10-04 16:10:13 +03:00 |
|
|
|
148def0bb5
|
Merge branch 'develop' into feature/data-migration
|
2023-10-04 15:23:34 +03:00 |
|
|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
edjalilov
|
5c380834ab
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# config/storage.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/store/index.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:57:29 +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 |
|
