|
|
ca3a49c25b
|
fix 56849
|
2022-05-05 17:07:24 +03:00 |
|
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
|
ffaea6ae2c
|
nginx: Remove old products locations
|
2022-02-22 18:24:54 +03:00 |
|
|
|
d157dd637e
|
Build: Removed old products nginx configs
|
2022-02-22 18:23:56 +03:00 |
|
Sergey Kirichenko
|
6e20d619d1
|
Mod socket proxy conf
|
2022-02-14 18:41:15 +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 |
|
|
|
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 |
|
|
|
d230a40e8e
|
Web: Socket: fixed cookies
|
2021-12-10 14:20:51 +03:00 |
|
|
|
ed41326acc
|
Web: socket-io, first version
|
2021-12-09 15:50:50 +03:00 |
|
|
|
307fc3e9b1
|
backup: update nginx config
|
2021-11-19 13:09:09 +03:00 |
|
Sergey Kirichenko
|
48cf953913
|
Add cache for locales *.json
|
2021-11-12 19:17:09 +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 |
|
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +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 |
|
|
|
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 |
|
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 |
|
Vashchuk Nikita
|
82abf11109
|
Merge branch 'develop' into feature/calendar
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
|
2021-05-18 13:24:02 +03:00 |
|
Vashchuk Nikita
|
94047ab0a1
|
Fix Calendar
|
2021-05-17 21:35:23 +03:00 |
|
Vashchuk Nikita
|
bf41c21c4e
|
Add Radicale
|
2021-05-11 18:05:46 +03:00 |
|
|
|
9e40feb771
|
Added and applied Common.json for common translations (languages issue)
|
2021-04-29 10:14:47 +03:00 |
|
|
|
fc297faa52
|
Merge branch 'develop' into feature/products
|
2021-04-23 17:35:11 +03:00 |
|
|
|
6a4fed2d2c
|
Init Calendar Server back-end
|
2021-04-21 21:47:27 +03:00 |
|
|
|
63a8caeb97
|
Init Mail Server back-end
|
2021-04-21 19:00:38 +03:00 |
|
Alexey Kostenko
|
ec6c1df3cf
|
Merge branch 'develop' into feature/oauth2.0
|
2021-04-08 11:59:08 +03:00 |
|
