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 |
|
|
b4a6f6c148
|
Fix editor/login config's paths on publish
|
2023-10-04 00:09:35 +04:00 |
|
|
2abd950e73
|
Update yarn.lock
|
2023-10-03 19:47:07 +04:00 |
|
|
e6aac472bc
|
merge from develop
|
2023-10-03 17:30:04 +03:00 |
|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
f3f76a1ebf
|
Merge pull request #1 from ONLYOFFICE/release/separation
Release/separation
|
2023-10-03 16:42:04 +03:00 |
|
|
7abaca70eb
|
Added minification of common locales in publish/web
|
2023-10-03 12:37:37 +04:00 |
|
|
27ae382c4e
|
Changed path to buildtools
|
2023-10-03 11:45:09 +04:00 |
|
|
d0add3dbb1
|
Changed paths (to publish/web)
|
2023-10-02 16:49:15 +04:00 |
|
|
3bad8cb8df
|
Merge branch 'release/separation' of https://github.com/ONLYOFFICE/DocSpace-client into release/separation
|
2023-10-02 15:29:22 +04:00 |
|
|
f188adc1e5
|
Web: Client: Fixed appsettings path
|
2023-10-02 14:16:20 +03:00 |
|
|
46e1927241
|
Removed useless files
|
2023-10-02 14:43:47 +04:00 |
|
|
d3b5085525
|
Remove files from other repositories
|
2023-10-02 14:04:28 +04:00 |
|
|
55d92a8fa6
|
nginx: fixed log
|
2023-09-29 21:59:55 +03:00 |
|
|
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 |
|
|
44c6720b5d
|
Merge branch 'develop' into feature/creating-room-from-one-folder
|
2023-09-29 19:17:15 +04:00 |
|
|
4d19a8b212
|
Merge pull request #1675 from ONLYOFFICE/feature/web-plugins
Feature/web plugins
|
2023-09-29 18:58:13 +04:00 |
|
|
692975b4ea
|
Web:Client:Plugins: add beta badge
|
2023-09-29 17:48:19 +03:00 |
|
|
4c9d5e9662
|
Web:Client:Plugins: hide upload button
|
2023-09-29 17:45:51 +03:00 |
|
|
18d5c7c659
|
Web: disable upload and delete plugin
|
2023-09-29 17:45:28 +03:00 |
|
|
2987cf797b
|
nginx: support pass for redis. bug fixed
|
2023-09-29 17:26:43 +03:00 |
|
|
dade84f85e
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 17:15:06 +03:00 |
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
|
db4abb80e8
|
Web:Client:Plugin: delete console log
|
2023-09-29 16:58:38 +03:00 |
|
|
0d00d85a76
|
Web:Client:Plugin: fix delete
|
2023-09-29 16:54:32 +03:00 |
|
Akmal Isomadinov
|
0748d05c19
|
Web: Added alert badge
|
2023-09-29 18:41:26 +05:00 |
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
e34a80fa9e
|
Merge pull request #1786 from ONLYOFFICE/bugfix/members-info-panel
Bugfix/members info panel
|
2023-09-29 17:18:21 +04:00 |
|
|
6f1691f918
|
Merge branch 'develop' into bugfix/members-info-panel
|
2023-09-29 17:08:28 +04:00 |
|
|
d155d1e368
|
Merge pull request #1770 from ONLYOFFICE/feature/tg-reports
feature/tg-reports
|
2023-09-29 17:02:28 +04:00 |
|
|
a435ea94f9
|
Docker: Replace port
|
2023-09-29 16:57:26 +04:00 |
|
|
1e778e9c24
|
Build: Added build command
|
2023-09-29 16:54:21 +04:00 |
|
|
649f17d05d
|
Docker: Remove onlyoffice-telegramreports
|
2023-09-29 16:53:32 +04:00 |
|
|
6165669b27
|
Web: Files: InfoPanel: fixed members list
|
2023-09-29 15:52:04 +03:00 |
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
e4faab8fc1
|
Nginx: Removed useless temp route
|
2023-09-29 15:23:04 +04:00 |
|
|
218706f2ac
|
Merge pull request #1784 from ONLYOFFICE/bugfix/Bug64290
bugfix/Bug64290
|
2023-09-29 14:54:59 +04:00 |
|
|
b5900aff6f
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-29 14:39:31 +04:00 |
|
|
059a24072b
|
Docker: Dev: rename image (restart all issues)
|
2023-09-29 14:32:51 +04:00 |
|
|
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 |
|
Viktor Fomin
|
dcffeea68a
|
Client: PortalSettings: ThirdParty: fix style
|
2023-09-29 13:09:09 +03:00 |
|
|
7eb9f4700a
|
ApiSystem: fix
|
2023-09-29 12:53:08 +03:00 |
|
|
87d0e7932a
|
Web: Files: Info-panel: fixed members list
|
2023-09-29 12:52:08 +03:00 |
|
Viktor Fomin
|
cbb04daadc
|
Client: PortalSettings: ThirdParty: fix style
|
2023-09-29 12:28:10 +03:00 |
|
|
520aa4d35f
|
Web:Client:Plugins: add system plugins
|
2023-09-29 12:22:05 +03:00 |
|
|
aa26f284fa
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 10:36:31 +03:00 |
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Viktor Fomin
|
866573449c
|
Client: PortalSettings: ThirdParty: add loader
|
2023-09-29 02:34:53 +03:00 |
|
Viktor Fomin
|
40d38fa825
|
Fix Bug 64290: Implement more visible separation of services
|
2023-09-29 02:09:52 +03:00 |
|
|
c860f1b3a3
|
Merge pull request #1754 from ONLYOFFICE/feature/system-web-plugins
Feature/system web plugins
|
2023-09-28 09:34:14 -07:00 |
|