IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
0c73b7f366
DocSpace-buildtools/config/nginx
History
Tatiana Lopaeva 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
..
includes Nginx: fix 2019-12-11 18:36:51 +03:00
sites-enabled Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files 2021-08-23 14:47:02 +05:00
batch.js Nginx: batch.json 2019-09-10 16:07:39 +03:00
onlyoffice-calendar.conf Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
onlyoffice-crm.conf Nginx: conf 2021-03-23 18:34:59 +03:00
onlyoffice-files-editor.conf Nginx: conf 2021-03-23 18:34:59 +03:00
onlyoffice-files.conf web: files: Added onlyoffice-files.conf 2020-02-26 11:03:13 +03:00
onlyoffice-login.conf Nginx: conf 2021-03-23 18:34:59 +03:00
onlyoffice-mail.conf Init Mail Server back-end 2021-04-21 19:00:38 +03:00
onlyoffice-people.conf Nginx: fix routing 2019-08-06 14:27:19 +03:00
onlyoffice-projects.conf Nginx: conf 2021-03-23 18:34:59 +03:00
onlyoffice-story.conf Nginx: storybook 2019-07-15 16:57:53 +03:00
onlyoffice-studio.conf Nginx: fix routing 2019-08-06 14:27:19 +03:00
onlyoffice.conf Merge branch 'develop' into feature/backup 2022-02-07 12:40:50 +03:00
proxy-frontend-virt.conf Added New Proxy settings 2021-04-05 15:49:02 +03:00
proxy-frontend.conf Added New Proxy settings 2021-04-05 15:49:02 +03:00