IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,901 Commits 40 Branches 22 Tags 420 MiB
477976da29
Commit Graph

38901 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timofey Boyko
477976da29 Revert "Merge branch 'develop' into feature/oauth2-client" 
This reverts commit 9d93525a91.
 2023-10-04 16:10:13 +03:00
Timofey Boyko
148def0bb5 Merge branch 'develop' into feature/data-migration 2023-10-04 15:23:34 +03:00
Timofey Boyko
82b21f9bdd Delete useless files 2023-10-04 15:23:20 +03:00
Timofey Boyko
e091dff386 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop 2023-10-04 15:08:14 +03:00
Elyor Djalilov
018541463b fix bad merge 2023-10-04 15:54:51 +05:00
Alexey Safronov
bb43dc825c Clear wrongPortalNameUrl (docker issues) 2023-10-04 14:50:54 +04:00
Timofey Boyko
9d93525a91 Merge branch 'develop' into feature/oauth2-client 2023-10-04 13:24:59 +03:00
edjalilov
4d8c270b47 Merge branch 'feature/data-migration' of https://github.com/ONLYOFFICE/DocSpace-client 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:58:29 +05: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
Vladimir Khvan
224609c371 file from another repository was removed 2023-10-04 14:54:40 +05:00
Vladimir Khvan
f261968e95 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:53:18 +05:00
Alexey Safronov
b4a6f6c148 Fix editor/login config's paths on publish 2023-10-04 00:09:35 +04:00
Alexey Safronov
2abd950e73 Update yarn.lock 2023-10-03 19:47:07 +04:00
Alexey Bannov
e6aac472bc merge from develop 2023-10-03 17:30:04 +03:00
Alexey Bannov
db2b2170e9 merge from master 2023-10-03 17:26:38 +03:00
Ilya Oleshko
f3f76a1ebf
Merge pull request #1 from ONLYOFFICE/release/separation 
Release/separation
 2023-10-03 16:42:04 +03:00
Alexey Safronov
7abaca70eb Added minification of common locales in publish/web 2023-10-03 12:37:37 +04:00
Alexey Safronov
27ae382c4e Changed path to buildtools 2023-10-03 11:45:09 +04:00
Alexey Safronov
d0add3dbb1 Changed paths (to publish/web) 2023-10-02 16:49:15 +04:00
Alexey Safronov
3bad8cb8df Merge branch 'release/separation' of https://github.com/ONLYOFFICE/DocSpace-client into release/separation 2023-10-02 15:29:22 +04:00
Ilya Oleshko
f188adc1e5 Web: Client: Fixed appsettings path 2023-10-02 14:16:20 +03:00
Alexey Safronov
46e1927241 Removed useless files 2023-10-02 14:43:47 +04:00
Alexey Safronov
d3b5085525 Remove files from other repositories 2023-10-02 14:04:28 +04:00
Alexey Bannov
55d92a8fa6 nginx: fixed log 2023-09-29 21:59:55 +03:00
Alexey Safronov
227531280d
Merge pull request #1765 from ONLYOFFICE/feature/creating-room-from-one-folder 
feature/creating-room-from-one-folder
 2023-09-29 19:29:04 +04:00
Alexey Safronov
44c6720b5d Merge branch 'develop' into feature/creating-room-from-one-folder 2023-09-29 19:17:15 +04:00
Alexey Safronov
4d19a8b212
Merge pull request #1675 from ONLYOFFICE/feature/web-plugins 
Feature/web plugins
 2023-09-29 18:58:13 +04:00
Timofey Boyko
692975b4ea Web:Client:Plugins: add beta badge 2023-09-29 17:48:19 +03:00
Timofey Boyko
4c9d5e9662 Web:Client:Plugins: hide upload button 2023-09-29 17:45:51 +03:00
Timofey Boyko
18d5c7c659 Web: disable upload and delete plugin 2023-09-29 17:45:28 +03:00
Alexey Bannov
2987cf797b nginx: support pass for redis. bug fixed 2023-09-29 17:26:43 +03:00
Timofey Boyko
dade84f85e Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins 2023-09-29 17:15:06 +03:00
Alexey Safronov
13d090c178 Web: Added ru translations + autofixes 2023-09-29 17:59:55 +04:00
Timofey Boyko
db4abb80e8 Web:Client:Plugin: delete console log 2023-09-29 16:58:38 +03:00
Timofey Boyko
0d00d85a76 Web:Client:Plugin: fix delete 2023-09-29 16:54:32 +03:00
Alexey Safronov
0d8bd872d6 Merge branch 'develop' into feature/web-plugins 2023-09-29 17:21:34 +04:00
Alexey Safronov
e34a80fa9e
Merge pull request #1786 from ONLYOFFICE/bugfix/members-info-panel 
Bugfix/members info panel
 2023-09-29 17:18:21 +04:00
Elyor Djalilov
b92a25719d transferring changes from Google to NextCloud 2023-09-29 18:14:24 +05:00
Alexey Safronov
6f1691f918 Merge branch 'develop' into bugfix/members-info-panel 2023-09-29 17:08:28 +04:00
Alexey Safronov
d155d1e368
Merge pull request #1770 from ONLYOFFICE/feature/tg-reports 
feature/tg-reports
 2023-09-29 17:02:28 +04:00
Alexey Safronov
a435ea94f9 Docker: Replace port 2023-09-29 16:57:26 +04:00
Alexey Safronov
1e778e9c24 Build: Added build command 2023-09-29 16:54:21 +04:00
Alexey Safronov
649f17d05d Docker: Remove onlyoffice-telegramreports 2023-09-29 16:53:32 +04:00
gopienkonikita
6165669b27 Web: Files: InfoPanel: fixed members list 2023-09-29 15:52:04 +03:00
Timofey Boyko
1e8fac378c Web:Client:Plugin: apply new layouts, add delete dialog 2023-09-29 15:32:27 +03:00
Alexey Safronov
e4faab8fc1 Nginx: Removed useless temp route 2023-09-29 15:23:04 +04:00
Alexey Safronov
218706f2ac
Merge pull request #1784 from ONLYOFFICE/bugfix/Bug64290 
bugfix/Bug64290
 2023-09-29 14:54:59 +04:00
Alexey Safronov
b5900aff6f Merge branch 'develop' into feature/tg-reports 2023-09-29 14:39:31 +04:00
Alexey Safronov
059a24072b Docker: Dev: rename image (restart all issues) 2023-09-29 14:32:51 +04:00
Pavel Bannov
17d75bc474
Merge pull request #1778 from ONLYOFFICE/feature/distributed-task-cancellation-token 
Feature/distributed task cancellation token
 2023-09-29 03:11:34 -07:00