Commit Graph

8000 Commits

Author SHA1 Message Date
ecb5c7fba2 Fixed Bug 55614 - Client.ExternalLink. ‘404 Not Found’ when opening an external link. 2022-02-17 15:12:54 +03:00
4255cec9ad Notify: fix unsubscribe url 2022-02-17 11:30:37 +03:00
bef7c923db Settings: added method to get current subscription state 2022-02-16 19:32:42 +03:00
Artem Tarasov
88b6c22ff4 Web: Doceditor: added webpack-merge 2022-02-16 18:34:01 +03:00
Vashchuk Nikita
0a384b2c28 refactoring async methods 2022-02-16 15:57:37 +03:00
Artem Tarasov
e90fbf2bfc Web: Doceditro: config fix 2022-02-16 14:16:27 +03:00
Viktor Fomin
fb8e0748f6
Web: Campaigns: add ads examples 2022-02-16 14:11:49 +03:00
Artem Tarasov
0853e487f8 Web: Doceditor: added client render 2022-02-16 13:04:04 +03:00
Artem Tarasov
fe8aefd2e4 Web: Doceditor: fixed import in render.js 2022-02-16 12:52:17 +03:00
Artem Tarasov
f92d2dd2c5 Web: Doceditor: added server render 2022-02-16 12:50:32 +03:00
Artem Tarasov
14490e8496 Web: Doceditor: added initDocEditor func 2022-02-16 12:46:47 +03:00
Artem Tarasov
260d00202c Web: Editor: Components: added dynamic component 2022-02-16 12:44:25 +03:00
Artem Tarasov
b0e5f7e335 Web: Doceditor: added Editor.js 2022-02-16 12:41:12 +03:00
Artem Tarasov
da51dfdd2e Web: Doceditor: added node app 2022-02-16 12:34:37 +03:00
Artem Tarasov
89a3b3443d Web: Doceditor: package.json: modified scripts 2022-02-16 11:37:47 +03:00
Artem Tarasov
8fb05dbc56 Web: Doceditor: modified .babelrc 2022-02-16 11:23:37 +03:00
Artem Tarasov
ffc5630958 Web: Doceditor: added simple webpack config 2022-02-16 11:21:42 +03:00
Artem Tarasov
a94022816f Web: Doceditor: added express, modified yarn.lock 2022-02-16 11:20:33 +03:00
Artem Tarasov
04667e6821 Web: Doceditor: removed next.js 2022-02-15 18:44:10 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
af51658493 Web: Campaigns: init example 2022-02-15 13:09:44 +03:00
f26eb17fe1 Web: Common: move shell changes from hotfix/campaigns banner 2022-02-15 11:37:31 +03:00
Vashchuk Nikita
631dcdc2e8 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	products/ASC.CRM/Server/Api/VoipController.cs
#	products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
#	products/ASC.CRM/Server/Utils/PdfCreator.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
#	web/ASC.Web.Core/Recaptcha.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
Vashchuk Nikita
7164c54b44 fix 2022-02-10 21:25:40 +03:00
Artem Tarasov
56758b5850 Web: Doceditor: fixed i18n config 2022-02-09 19:39:04 +03:00
Artem Tarasov
acb5701ee4 Web: Doceditor: applied i18n 2022-02-08 17:44:34 +03:00
Artem Tarasov
f7c4cf334d Web: Doceditor: added config i18n 2022-02-08 17:43:59 +03:00
74d6b4bfd6 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-08 16:06:34 +03:00
8d6818c6cd Web: Client: fixed header-logo-wrapper styles 2022-02-08 16:06:25 +03:00
Artem Tarasov
39c2fabb69 Web: Doceditor: fixed page title and icon change 2022-02-08 02:25:10 +03:00
Artem Tarasov
43f882ee32 Web: DocEditor: index.js location changed, added Loader 2022-02-08 01:49:48 +03:00
Artem Tarasov
51e8212eb9 Web: DocEditor/nginx: added base path for doceditor 2022-02-08 01:48:41 +03:00
Artem Tarasov
331a53fbed Web: Dooceditor: added redirect to login page if user is not logged in 2022-02-07 23:11:15 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03:00
Artem Tarasov
d142d16c4a Web: Doceditor: applied initSSR for axiosClient 2022-02-04 17:00:15 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
0f76ba3613 Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites. 2022-02-03 17:49:00 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
d0bb0c18a6 Web: Files: Fixed editing of converted file. 2022-02-02 19:32:38 +03:00
Artem Tarasov
275a490545 Merge branch 'develop' into feature/doceditor-ssr 2022-02-02 19:26:51 +03:00
Artem Tarasov
9d6918170f Web: Doceditor: fix dependencies fix 2022-02-02 19:20:34 +03:00
Artem Tarasov
bca026544c Web: Doceditor: moved initialization on the server side 2022-02-02 19:15:21 +03:00
Artem Tarasov
f35e24c4e8 Web: Doceditor: added _error.js 2022-02-02 19:13:39 +03:00
Artem Tarasov
3fe03c4a29 Web: Doceditor: renamed webpack.config.js to webpack.config-csr.js 2022-02-02 19:11:59 +03:00
6750931fe9 Web: Files: Added error handler for request edit rights function. 2022-02-02 18:29:00 +03:00
Artem Tarasov
a04235b260 Web: Common/Studio: moved tryRedirectTo() to separate file (ssr crash) 2022-02-02 18:28:29 +03:00
76eead7708 Web: Files: Fixed editing of shared form. 2022-02-02 18:16:52 +03:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
47d43fbcfb WebL Editor: Removed commented code 2022-01-31 15:16:31 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
Artem Tarasov
1d0bd0bf8b Web: Doceditor: change remoteApiUrl 2022-01-28 13:52:20 +03:00
Artem Tarasov
1e6d2f1e1c Web: Editor: added global styles 2022-01-28 13:51:23 +03:00
Artem Tarasov
7f3878afc5 Web: Doceditor: created route product/files/doceditor. removed [...slug].js page 2022-01-28 13:50:09 +03:00
Artem Tarasov
9e32295fae Web: Editor: added [...slug].js (index.page) 2022-01-27 16:54:40 +03:00
Artem Tarasov
96f15bc2a3 Web: Editor: added _app.js and _document.js (styled-components for ssr) 2022-01-27 16:53:41 +03:00
Artem Tarasov
8674d500ae Web: Editor: added nextjs config 2022-01-27 16:46:41 +03:00
Artem Tarasov
1ec56b19de Web: Editor: added nextjs 2022-01-27 16:45:36 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
445f03097d Fix content-type header 2022-01-24 22:44:18 +03:00
eb75b0b32a Web: Files: Added opportunity to react on modify-folder with socket 2022-01-24 20:43:24 +03:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00
f3d8b8d17a analizators/s1854 2022-01-21 16:36:36 +03:00
2f5a70e6ef analizators/s1940 2022-01-21 16:27:09 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
893c4ddc5a Wen: Editor: Added a new parameter to the conversion api method. 2022-01-21 15:07:32 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
eb9a33c660 analizators/s3218 2022-01-20 11:36:56 +03:00
3f28dfe78a analizators/s3237 2022-01-20 11:36:42 +03:00
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
Vashchuk Nikita
5b9668c14f ILinkDao, fix 2022-01-18 19:50:31 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
f1f7a82b39 analizators/U2U1208 2022-01-18 17:00:48 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00