|
c62d42de80
|
Socket.IO: Move pingInterval and reconnectAttempts to config
|
2022-02-09 12:11:39 +03:00 |
|
|
5d0bcdbbfb
|
Config: Added redisHost, redisPort
|
2022-02-08 17:20:13 +03:00 |
|
|
40d56075f1
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
|
2022-02-07 12:40:50 +03:00 |
|
|
f3b3b08af1
|
add support rabbitmq. split ASC.Data.Backup service on two services
|
2022-02-04 20:44:03 +03:00 |
|
|
a2cc00b521
|
fix test config (dotnet issue)
|
2022-02-04 18:40:55 +03:00 |
|
|
1908af64f0
|
cache: return support kafka. refactoring
|
2022-01-27 15:20:51 +03:00 |
|
|
e810605a4d
|
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
|
2022-01-25 12:54:21 +03:00 |
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
4319f5c656
|
fixed authentication/register.json
|
2022-01-14 16:56:23 +03:00 |
|
|
48897308d7
|
refactoring
|
2022-01-13 22:17:56 +03:00 |
|
|
6b883bcd60
|
Merge branch 'develop' into feature/support-elasticache
|
2022-01-13 18:16:43 +03:00 |
|
|
986d1d49e6
|
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
|
2022-01-13 14:24:14 +03:00 |
|
|
5bd347a775
|
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
|
2022-01-12 12:58:07 +03:00 |
|
|
efb51c613f
|
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
|
2022-01-11 19:28:48 +03:00 |
|
|
6cbd02b71c
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# products/ASC.Files/Server/DocStore
# yarn.lock
|
2022-01-10 11:06:32 +03:00 |
|
|
a7dc8c7dfd
|
sync CommunityServer and AppServer cache via redis
|
2021-12-30 18:09:20 +03:00 |
|
|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
44b227ba98
|
NLog: maxArchiveDays
|
2021-12-23 21:49:02 +03:00 |
|
|
6d250efffa
|
add *.dll for support redis + update Grpc.* dll
|
2021-12-23 16:17:31 +03:00 |
|
|
31f03a430b
|
Config: Restored old languages
|
2021-12-23 14:00:08 +03:00 |
|
|
d230a40e8e
|
Web: Socket: fixed cookies
|
2021-12-10 14:20:51 +03:00 |
|
|
8538b55dfc
|
Web: Turned on all languages
|
2021-12-09 21:45:10 +03:00 |
|
|
ed41326acc
|
Web: socket-io, first version
|
2021-12-09 15:50:50 +03:00 |
|
|
8abd9ef42b
|
Nlog: fixed configs
|
2021-12-08 22:17:39 +03:00 |
|
|
dec07c931c
|
moved from d50a38db
|
2021-11-29 18:40:22 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
d31ea87211
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-11-21 13:57:55 +03:00 |
|
|
307fc3e9b1
|
backup: update nginx config
|
2021-11-19 13:09:09 +03:00 |
|
|
1a282c2073
|
Config: Extra comma removed
|
2021-11-17 16:35:22 +03:00 |
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
Sergey Kirichenko
|
48cf953913
|
Add cache for locales *.json
|
2021-11-12 19:17:09 +03:00 |
|
|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +03:00 |
|
|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
Sergey Kirichenko
|
34378fa1e6
|
Modify nginx config (#401)
* Modify nginx config
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
|
2021-10-19 11:52:15 +03:00 |
|
Sergey Kirichenko
|
e85ed7a878
|
Add debuginfo.md to no-cache status
|
2021-10-17 21:18:01 +03:00 |
|
Sergey Kirichenko
|
439f1d0c18
|
Fix, do not cache remoteEntry.js
|
2021-10-15 12:52:13 +03:00 |
|
Sergey Kirichenko
|
86abb2812f
|
Fix Bug 53063 (#397)
|
2021-10-14 11:26:32 +03:00 |
|
Sergey Kirichenko
|
5d1bfbefa4
|
Modify docker images build (#380)
* Modify images build config
* Cosmetic modify
* Modify git clone ind Dockerfile
|
2021-10-06 16:43:18 +03:00 |
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
febec81e59
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-27 13:22:59 +03:00 |
|
|
3d0622c68b
|
Workbox: Config: Removed html from cache (issue with login/logout)
|
2021-09-27 13:22:52 +03:00 |
|
|
590db7bb67
|
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
|
2021-09-27 12:35:07 +03:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
6ada582cc5
|
Web: service-worker updates optimization
|
2021-09-24 20:10:54 +03:00 |
|
|
e755d2eda8
|
renamed providers to lowercase
|
2021-09-24 17:36:46 +03:00 |
|
|
bd9492b533
|
fixed version number
|
2021-09-24 11:06:57 +03:00 |
|
|
77323e02cc
|
fix Bug 50294
|
2021-09-14 22:19:26 +03:00 |
|
|
ea2c45ec55
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-03 14:57:01 +03:00 |
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
9be5858ae7
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-01 13:23:33 +05:00 |
|
|
fce956991e
|
nginx: fix
|
2021-08-31 18:38:59 +03:00 |
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
cc2e2764d2
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-08-23 14:47:02 +05:00 |
|
|
61528fb9c2
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-08-20 17:35:31 +03:00 |
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
9f83801f88
|
Nlog: optimization
|
2021-08-20 15:42:43 +03:00 |
|
|
f1e5076cb1
|
Web: added scripts path in nginx
|
2021-08-19 13:32:31 +03:00 |
|
|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
9873ea6fa0
|
Nginx: config for developers
|
2021-08-16 19:26:16 +03:00 |
|
|
f3ec5bb0e0
|
Nginx: static config
|
2021-08-16 15:18:45 +03:00 |
|
|
7e249a170e
|
removed socketio config
|
2021-08-12 15:58:56 +03:00 |
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
999e1157d5
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-11 09:59:57 +03:00 |
|
|
af18e175dc
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 11:13:17 +03:00 |
|
|
e5c4770ae6
|
DB: fix connection string
|
2021-08-10 11:07:40 +03:00 |
|
|
5d840f65b1
|
DB: fix connection string
|
2021-08-10 11:03:11 +03:00 |
|
|
16469eb138
|
Api: added ConfigureNLogLogging
|
2021-08-08 15:56:54 +03:00 |
|
|
b6258b4ff1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withLoader.js
|
2021-07-28 20:15:09 +03:00 |
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
cf7d002bc1
|
Merge branch 'develop' into feature/calendar
|
2021-07-28 12:16:39 +03:00 |
|
|
93d1cb0f38
|
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
|
2021-07-27 15:56:19 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
cd8e752c03
|
Workbox config: minimized globPatterns (only js and css)
|
2021-07-26 15:38:55 +03:00 |
|
|
0f27a6c673
|
Merge branch 'develop' into release/1.0.0
|
2021-07-23 17:34:43 +03:00 |
|
|
675fb8de21
|
Web: Fix caching remoteEntry.js
|
2021-07-23 17:20:42 +03:00 |
|
|
fa500d094f
|
Merge branch 'develop' into release/1.0.0
|
2021-07-22 11:12:37 +03:00 |
|
|
13f8f5ef7d
|
Fix sw.js creation
|
2021-07-21 18:28:56 +03:00 |
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
Sergey Kirichenko
|
5bcca1da75
|
Fix nginx config for cache config (#306)
* Fix cache-controll config
* Modify nginx cofig
|
2021-07-19 17:01:04 +03:00 |
|
|
95a7bdf7b5
|
Update onlyoffice.conf
|
2021-07-16 12:47:42 +03:00 |
|
Sergey Kirichenko
|
6ca5896715
|
Add etag config to proxy (#301)
* Add etag config to proxy
* Modify cache control
* Modify config
|
2021-07-15 12:01:04 +03:00 |
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
cb8d225707
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
|
2021-07-12 13:08:40 +03:00 |
|
|
2950f72bb8
|
Config: Restored appsettings config
|
2021-07-09 19:23:56 +03:00 |
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
|
5cea2de9f6
|
Merge branch 'develop' into feature/personal
|
2021-07-09 16:29:14 +03:00 |
|
Sergey Kirichenko
|
9546e04e44
|
Add cache control in the backend proxy (#299)
* Modify cache control in the proxy
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Add expires conf
* Del swp file
|
2021-07-09 16:16:15 +03:00 |
|
|
a4a5a508bd
|
(onlyoffice.conf) Added location for icons from root.
|
2021-07-02 15:33:33 +03:00 |
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|
Sergey Kirichenko
|
92684a2b3c
|
Modify elasticsearch configuration file (#290)
* Fix config elk json file
* Cosmetic modify
|
2021-06-25 10:14:53 +03:00 |
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
Sergey Kirichenko
|
7af9bb08c9
|
Fix elasticsearch configure (#285)
|
2021-06-18 14:30:11 +03:00 |
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
Sergey Kirichenko
|
a91ea81e89
|
Modify elasticsearch configuration (#281)
* Modify elasticsearch config
* Modify version ELK
* Cosmetic modify
|
2021-06-17 12:49:39 +03:00 |
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
e43445cb2d
|
Config: Enabled personal mode in appsettings.json
|
2021-06-02 16:17:23 +03:00 |
|