0e6078f9e2
Merge branch 'develop' into feature/ClearEvents
...
# Conflicts:
# ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
85574630cb
Merge branch 'develop' into feature/ClearEvents
2021-06-23 15:30:55 +03:00
68ec473a6c
fix
2021-06-22 21:44:03 +03:00
d8abde6d88
SSoAuth: fix buid and run
2021-06-22 19:44:09 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure ( #285 )
2021-06-18 14:30:11 +03:00
00cc15fbf5
Merge branch 'develop' into feature/ClearEvents
2021-06-18 12:21:54 +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
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
d2fa149247
Jenkins: fix
2021-06-15 17:32:25 +03:00
89264cc48d
crm: created common project for common services
2021-06-15 13:41:17 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc ( #276 )
2021-06-10 18:18:07 +03:00
Sergey Kirichenko
82b3109fbc
Fix building ASC.Files image ( #275 )
2021-06-10 15:42:04 +03:00
a9cb51056b
Add support docker installation ( #271 )
...
* Fix removing old packages in rpm
* Add script downloads from github
* Add oneclickinstall by using docker
* Add a common script to select the installation
* Correction file name
* Add a reconfigure
* Edit download files
* Add a parameter for silent download
* Change the external port configuration
* Add the dotnet_env variable
* Add password generation
* Add invalid character filtering
* Change the copyright
* Change the copyright
* Add the local scripts parameter
* Minor fixes
* Copyright correction
2021-06-09 18:48:42 +03:00
SuhorukovAnton
860b682594
replace "DeleteOldEvents" in new service
2021-06-04 14:10:37 +03:00
15fb1c9a68
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
2021-05-31 19:01:54 +03:00
2dd7044097
Jenkins: fix notify
2021-05-31 19:01:40 +03:00
8d88dbae2c
Jenkins: fix test
2021-05-31 14:25:14 +03:00
570ede7bba
Merge branch 'develop' into feature/11.5.2
...
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +03:00
4e5bd47c26
Feature/rpm update ( #229 )
...
* Add a build and install new services
* Change the packaging for the new build script
* Correct the configuration
* Add a bug fix with a mysql password containing ';'
* Fix services crash error
* Fix incorrect value addition in mysql
* Fix a rabbitmq error on CentOS 8
* Fix creating an invalid mysql password
* Fix non-existent tables Tenants
* Add an update to 1click
* Code correction
* Add two new services
* Add the buildpath variable
* Code Optimization
* Renaming services and creating a variable for the app name
* Revert "Merge branch 'feature/rpm-update' of https://github.com/ONLYOFFICE/AppServer into feature/rpm-update"
This reverts commit 19c1eae6f6e3f22f4cbc0e3276fa892b0d9fa97a, reversing
changes made to fb36a996366291486e3b9f5a6f46398916ef8a6c.
* Code Optimization
* Code optimization
* Code optimization and creating a variables
2021-05-20 17:39:38 +03:00
Vyacheslav Semin
3c2cc92001
Make the necessary edits to install in k8s ( #255 )
...
* Make the necessary edits to install in k8s
* Add image build for waiting for appserver to start
* Edit the env file
2021-05-18 12:36:21 +03:00
8c446a574e
Jenkins: fix stages
2021-05-05 18:30:06 +03:00
SuhorukovAnton
3435b49b72
replace_nuget: delete configfile
2021-05-05 14:48:34 +03:00
Sergey Kirichenko
1e05b2a216
Del files in base image ( #239 )
...
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-29 15:27:50 +03:00
Sergey Kirichenko
baafc5f175
Add calendar and mail service in docker ( #234 )
...
* Add 2 services building feature
* Add 2 services for runnig
* Del in .env status latest
* Add to notify.yml 2 volumes
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-26 19:08:48 +03:00
1516fe0249
Merge branch 'develop' into feature/products
2021-04-21 21:49:39 +03:00
6a4fed2d2c
Init Calendar Server back-end
2021-04-21 21:47:27 +03:00
d57433c9dc
Added MailServer.bat
2021-04-21 21:46:59 +03:00
Sergey Kirichenko
69fb52026f
Add feature to run single notify service ( #223 )
...
* Modify building docker images
* Add argument to build script
* Modify build images
* Add feature build from oficial dotnet image
* Add feature build from oficial dotnet image
* Rename notify yml file
* Fix conflict
* Fix conflict
* Fix conflict
* Del RID aprument in build scripts
* Cosmetic modify
2021-04-14 15:45:16 +03:00
6fbb566c4e
Web: Init Mail/Calendar Comming Soon pages
2021-04-12 13:41:16 +03:00
4d644aff17
Merge branch 'master' into develop
2021-04-12 10:34:56 +03:00
be66f17d92
Fix version mismach
2021-04-09 16:29:45 +03:00
e86580e137
build: Removed useless old bat-files
2021-04-07 21:35:43 +03:00
Sergey Kirichenko
3ba4cf8807
Add build app on docker without copy dll ( #213 )
...
* Modify files for running new services
* Modify Dockerfile-app
* Modify
* Fix Dockerfile-app
* Fix start servives studio-notify, urlshortener
* Fix, modify services with sdk 5
* Build app without copy dll
* Modify Dockerfile
* Cosmetic changes
* Add build srcipts to Dockerfile
* Delete test sh scripts
* Del status 4testing
* Fix docker hub build
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-07 12:15:27 +03:00
Sergey Kirichenko
ad3eed3552
Add scripts for building services ( #212 )
...
* Add build and publish srcipts for services
* Add script for buildint frontend
* Fix publish-backend.sh
* Modify publish script for building
* Cosmetic modify publish backend script
2021-04-06 14:28:12 +03:00
8f2baed113
Jenkinsfile: fix
2021-03-31 18:24:32 +03:00
d46d48f2ab
fixed Jenkinsfile
2021-03-26 16:41:21 +03:00
00699a4304
fixed Jenkinsfile
2021-03-23 22:22:38 +03:00
5930c30150
Build: Front-end: commented wipe
2021-03-23 15:21:40 +03:00
a50701e6da
Build: Refactoring
2021-03-23 14:10:33 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
c1fa203780
Feature/rpm support ( #192 )
...
* Create specfiles and systemd scripts
* Add fix
* Add systemd packaging
* add fix
* Add fix
* Add configuracion and fixes
* Update app-conf.sh and change cfg dir
* Add ability to start nodejs
* Update config
* Change owner of folders
* Delete temporary files
* Fix chmod config
* Fix configure docs
* Сode optimization
* Add configuration elasticsearch
* Rename directory
* Fix work with the name of branches that include '/'
* Fix work with the name of branches that include '/'
* Revert "Fix work with the name of branches that include '/'"
This reverts commit c0970cd84657dac503843720b0cdbce0130a329c.
* Revert "Fix work with the name of branches that include '/'"
This reverts commit 6ea3718df8950dd6ec87642195822a6ee433c40e.
* Add fix
* Add fix
* Add ability to change the release and version
* Fix docs configuration
* Add kafka configuration
* Add environment variables
* Add fix
* Add old rpms removal and buildroot removal
* Add OneClickInstall
* Correct the typo
* Move systemd from rpm to common
* Add a user-defined configuration option .json
* Add minor fix
* Add a machinekey generation
* Add a typo fix
* Change nodejs version
* Change the location of some folders
* Fix minor bugs
* Fix minor bugs
* Rename service directories
* Fix kafka privileges
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-03-19 15:50:47 +03:00
84a1102418
Build: Added new Web apps for run/install
2021-03-15 12:35:19 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
d696f18801
Jenkinsfile: fix notify
2021-02-24 15:37:40 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
7ce0aa896d
Jenkins: fixed tests
2021-02-19 15:07:44 +03:00
