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
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
f3cd204b14
Jenkins: run "notify" stage only once at first build
2021-02-10 16:03:44 +03:00
61cfd029d9
Added CRM
2021-01-26 20:36:03 +03:00
69922e7c48
Added ASC.Projects
2021-01-26 12:32:31 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# 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.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-22 11:24:16 +03:00
88f37bdfc6
Merge branch 'develop' into feature/multi-stage-docker-env
2021-01-18 15:25:45 +03:00
Sergey Kirichenko
525654fdef
Correct spelling
2021-01-18 15:09:43 +03:00
ae69a9559e
Files: removed temp
2021-01-13 12:41:29 +03:00
9f8b36da5c
Files: tests. log
2021-01-12 19:00:22 +03:00
19c9001082
Files: fix test
2021-01-12 18:32:05 +03:00
122048dd49
Files: temp fix
2021-01-12 18:27:56 +03:00
5289f92935
Files: temp fix
2021-01-12 18:01:38 +03:00
42e4fdcb37
Jenkins: remove temp
2021-01-12 10:32:55 +03:00
5bf44cbcff
Test: fix
2021-01-11 20:19:43 +03:00
8529593c42
Jenkinsfile: run test
2021-01-11 19:51:45 +03:00
889949eb95
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/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/Section/Header/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/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
2021-01-11 12:21:59 +03:00
Sergey Kirichenko
f11758af1c
Cosmetic modify Docker-app
2020-12-30 10:51:40 +03:00
Steklov Sergei
faa8c66d09
Add source branch variable to docker hub build environment ( #163 )
2020-12-29 17:08:38 +03:00
12881aa2c6
Use master as default branch for build ( #160 )
...
* Use master as default branch for build
* Update build
* Update push
2020-12-28 20:13:33 +03:00
Sergey Kirichenko
bb06f4aa53
Add docker multiple Appserver services ( #136 )
2020-12-25 14:27:26 +03:00
1182456146
Build: Added wiping of node_modules for Front-end
2020-12-01 13:44:09 +03:00
f70450ff33
Build: Fixed bat-files
2020-11-24 13:40:13 +03:00
e872a0118a
build: Uncommented call bat
2020-10-23 13:36:25 +03:00
4e52a84db1
Build: Added new bat files
2020-10-23 13:12:17 +03:00
18ef6e7cb6
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
0631da043b
extract build.sln.bat
2020-10-14 18:24:39 +03:00
3ca0990715
Merge branch 'master' into feature/files
...
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +03:00
37d36ce86c
Supervisor: fix backup
2020-10-07 16:10:20 +03:00
2c1d473314
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +03:00
0dbae1adfd
Merge branch 'master' into feature/files
2020-09-28 11:32:13 +03:00
SuhorukovAnton
693e35ac57
add ASC.TelegramService
2020-09-24 17:30:27 +03:00
886c7d6464
Merge branch 'master' into feature/files
2020-09-07 18:16:33 +03:00
SuhorukovAnton
2d3f183567
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-07 17:00:48 +03:00
SuhorukovAnton
fc80c8e067
encryption: add bat
2020-09-05 23:08:00 +03:00
66009ff013
Jenkins: fix
2020-09-04 14:44:58 +03:00
e6f9e88bb8
new jenkins server
2020-09-03 18:49:43 +03:00
29d9f21d05
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
maksim
95299daaf9
ASC.Data.Storage.Migration: adding listener and extension
2020-08-27 17:06:03 +03:00
955d1c4db6
Merge branch 'master' into feature/files
2020-08-27 12:07:08 +03:00
be32dfb86a
Docker: fix publish
2020-08-27 12:06:21 +03:00
5633d2467b
Merge branch 'master' into feature/files
2020-08-27 10:42:47 +03:00
maksim
eb58c24d2e
LaunchSettings: fix
2020-08-24 10:45:51 +03:00
maksim
eecf23f214
ASC.Data.Storage.Migration: bugfix
2020-08-24 09:52:17 +03:00
b06a4b4991
Merge branch 'master' into feature/socket.io
...
# Conflicts:
# ASC.Web.sln
# thirdparty.sln
# thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
2020-08-21 15:25:07 +03:00
cff1a01f70
Docker: fix build
2020-08-20 19:04:13 +03:00
SuhorukovAnton
4db1cd0af8
Merge branch 'master' into feature/socket.io
2020-08-14 14:01:27 +03:00
Ilya Oleshko
37fe1cab21
Merge branch 'master' into feature/files
2020-08-12 18:05:29 +03:00
SuhorukovAnton
112a378d28
socket: add bat
2020-08-09 11:34:09 +03:00
SuhorukovAnton
b5ff2b9feb
socket.io: fix
2020-08-03 11:20:57 +03:00
585d98f8f4
Files: core. replace
2020-07-28 15:45:14 +03:00
156f7cb534
Docker: fix files.
2020-07-28 14:21:41 +03:00
Artem Tarasov
1a8aacebdc
Merge branch 'master' into feature/Wizard
...
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
2020-07-21 13:13:47 +03:00
8d0d5fd908
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
2020-07-16 14:41:32 +03:00
281b7a4406
Docker: fix
2020-07-16 14:27:30 +03:00
7f095f03d1
Merge branch 'master' into feature/Wizard
...
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
Artem Tarasov
0e2da28101
added getPortalSettings after wizard completed
2020-07-10 19:00:21 +03:00
45678da8e5
Merge branch 'master' into feature/files
2020-07-10 14:58:37 +03:00
74b9676819
Docker: added thumbnail, backup, notify
2020-07-07 19:26:55 +03:00
87f85fdefe
Merge branch 'master' into feature/files
2020-06-29 09:53:07 +03:00
8f9e294d21
docker: bug fix
2020-06-26 12:28:38 +03:00
b3aaa823f5
docker: update sql dump
2020-06-26 11:46:51 +03:00
cfdc6d495e
Merge branch 'master' into feature/files
2020-06-26 09:46:04 +03:00
29a0e752bb
Merge branch 'master' into feature/backup
...
# Conflicts:
# ASC.Web.sln
# web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
d53b11967a
Merge branch 'master' into feature/backup
2020-06-25 15:37:53 +03:00
2fe2c2167b
Merge branch 'master' into feature/thumbnails
...
# Conflicts:
# ASC.Web.sln
2020-06-25 15:01:38 +03:00
8afdad8eb4
docker: select branch
2020-06-24 16:51:29 +00:00
be09fc0510
docker: change config/supervisor/supervisord.conf
2020-06-23 19:40:01 +00:00
453c812476
docker update
2020-06-23 18:10:13 +00:00
11cf2a954f
docker: mysql sample data
2020-06-23 19:55:14 +03:00
62e179fae0
update dockerfile
2020-06-23 15:31:48 +00:00
SuhorukovAnton
6f4bd59c6d
Thumbnails: refactoring
2020-06-21 14:45:31 +03:00
SuhorukovAnton
103de233e9
Thumbnails: fix
2020-06-17 14:00:28 +03:00
fc0826b60d
Backup: service, progress
2020-06-16 14:34:44 +03:00
02dd1e9e31
Merge branch 'master' into feature/urlshortener
...
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
2020-05-20 18:18:31 +03:00
d08a564946
ApiSystem: service, config, di
2020-05-19 20:41:37 +03:00
90d93db14c
FileService: bat and launchSettings
2020-05-08 11:35:04 +03:00
8bbe383e78
Added url shortener service install scripts
2020-03-05 14:56:07 +03:00
NikolayRechkin
edf8915867
Merge branch 'master' into feature/calendar
2020-02-27 16:52:11 +03:00
NikolayRechkin
c18543485b
Merge branch 'master' into feature/calendar
2020-02-26 14:46:42 +03:00
ac5017da99
Merge branch 'master' into feature/elastic
...
# Conflicts:
# build/build.bat
# build/rebuild.bat
2020-02-26 10:46:37 +03:00
2ccd226940
web: clients: Fixed CRA proxy bug;
2020-02-26 10:02:37 +03:00
af40cd8ca7
web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined
2020-02-25 11:56:41 +03:00
4ca24f0077
Files: Init Files.Client
2020-02-25 09:58:09 +03:00
00246f7f9f
Files: Startup
2020-02-12 13:48:58 +03:00
NikolayRechkin
be5e845438
init Calendar
2020-02-12 10:58:31 +03:00
e33caf13dd
Jenkinsfile: chat_id to credentials
2020-01-15 13:35:21 +03:00
f3da100abe
fixed message
2020-01-15 12:13:42 +03:00
39ceff556a
Jenkins: fixed telegram message
2020-01-15 11:47:33 +03:00
d298e09b0b
Removed publishCoverageGithub
2020-01-14 23:13:42 +03:00
abd5e307be
fix
2020-01-14 22:21:49 +03:00
8332ba4502
Revert "fix"
...
This reverts commit af425365f4
.
2020-01-14 21:38:25 +03:00
af425365f4
fix
2020-01-14 18:57:04 +03:00
184a7febf2
Jenkinsfile: fix
2020-01-14 18:40:32 +03:00
13c3bbc780
fix
2020-01-14 18:15:52 +03:00
fbb75572f9
Jenkinsfile: added when
2020-01-14 18:10:07 +03:00
4330c3b4c3
JenkinsFile: publishCoverageGithub and telegram message
2020-01-14 17:44:56 +03:00
c3d38416a2
fix message
2020-01-14 16:54:22 +03:00
cee6b77cbd
Jenkinsfile: fix
2020-01-14 16:34:21 +03:00
2cb0e94b6b
Jenkins: telegram to end
2020-01-14 16:07:05 +03:00
6f91f1bbf6
Jenkisfile: publishCoverage
2020-01-14 15:28:14 +03:00
cc6eb2a4fb
fix
2020-01-14 14:06:56 +03:00
059989ba90
Jenkinsfile: fix cobertura
2020-01-14 13:54:46 +03:00
38451fd460
Jenkinsfile: temp echo.Added cobertura
2020-01-14 13:41:38 +03:00
c040b1718e
Jenkinsfile: test
2020-01-14 12:05:28 +03:00
58f001f2a3
Jenkinsfile: telegram token to credentials, skipdefaultcheckout
2020-01-14 11:44:48 +03:00
82189388ca
fix
2020-01-13 18:50:59 +03:00
b69e86325f
Fix
2020-01-13 18:46:28 +03:00
27d03a8cd5
fix
2020-01-13 18:31:49 +03:00
90f5723f48
fix
2020-01-13 18:23:42 +03:00
b1bd5a2b01
fix
2020-01-13 18:18:24 +03:00
ff67ff6f2d
fix
2020-01-13 18:12:12 +03:00
6abbe5a81d
fix
2020-01-13 18:06:53 +03:00
3e2a78e046
Added telegram step
2020-01-13 18:04:05 +03:00
7c6a9f09a5
Added telegram step
2020-01-13 18:02:17 +03:00
7c080b9804
Jenkins: fixed test
2020-01-13 16:51:06 +03:00
88a2c9637d
Jenkinsfile: fix
2020-01-13 16:22:41 +03:00
9173603032
fix
2020-01-13 16:05:16 +03:00
b4342db200
fix
2020-01-13 15:56:11 +03:00
71b8b49ed2
fix
2020-01-13 15:52:40 +03:00
5a4ae07ca8
fix
2020-01-13 15:51:09 +03:00
8c1a49c66c
fix
2020-01-13 15:49:49 +03:00
9a6bf07ada
fix
2020-01-13 15:44:26 +03:00
d6513a3291
fix
2020-01-13 15:38:44 +03:00
5f150ed505
fix
2020-01-13 15:36:30 +03:00
eac26ebcf7
fix
2020-01-13 15:11:47 +03:00
05003c34b7
Jenkinsfile: added windows build
2020-01-08 16:28:12 +03:00
549f928c2f
Jenkinsfile: added matrix
2020-01-08 16:06:12 +03:00
e40bbe0bb6
Jenkinsfile: added matrix
2020-01-08 16:02:43 +03:00
a824681768
Jenkinsfile: sequental build stage
2020-01-08 15:34:06 +03:00
de2b072d83
removed batch.sh
2020-01-08 15:28:27 +03:00
7ad678faba
Added build.sh
2020-01-08 15:04:59 +03:00
4bb2b542f3
Jenkkinsfile: added scripts
2020-01-08 14:58:21 +03:00
ff82fea65d
build\scripts\components renamed to components.bat
2020-01-08 14:22:52 +03:00
00e8be08a9
fix
2020-01-08 14:05:05 +03:00
e523cebfe3
fix
2020-01-08 14:02:55 +03:00
5101fcbf06
Jenkinsfile: added script for building components
2020-01-08 14:01:37 +03:00
680b94a61c
fix path
2020-01-08 12:51:08 +03:00
21d6753a69
Jenkinsfile: publish coverage
2020-01-08 12:44:53 +03:00
10e65286bd
fix
2020-01-07 22:35:05 +03:00
be5068127b
Jenkinsfile: test
2020-01-07 22:28:24 +03:00
2fe6d4b559
Jenkinsfile: added test
2020-01-07 22:20:31 +03:00
a74cf994db
Jenkinsfile: fixed post
2020-01-07 22:13:56 +03:00
fe2942286d
Jenkinsfile: added test Stage
2020-01-07 22:12:23 +03:00
c50988c49e
Jenkinsfile: added parallel build people
2020-01-07 13:21:04 +03:00
a434a49505
Jenkinsfile: added build scripts
2020-01-06 20:01:31 +03:00
f79c86a4f5
Jenkinsfile: added build scripts
2020-01-06 19:57:19 +03:00
4332aa13c8
Jenkinsfile: fix agent
2020-01-06 14:31:29 +03:00
0705324c90
Jenkinsfile: agent
2020-01-06 14:27:40 +03:00
040a2d0d6b
Jenkinsfile: Hello World
2020-01-06 14:15:57 +03:00
ea3147af98
Update Dockerfile
2019-12-16 16:06:06 +03:00
5eeff88737
web: New packages fixes
2019-12-13 16:58:09 +03:00
fdfaae8abe
Docker: .net core up to 3.1
2019-12-09 15:19:18 +03:00
0b1feec7af
Docker: added ASC.Web.Common
2019-12-05 12:14:03 +03:00
32a4cb576a
web: Common: Added install packages/asc-web-common dependencies
2019-11-26 13:51:30 +03:00
49d5000cd2
Merge branch 'master' into feature/asc-web-common
2019-11-15 15:29:57 +03:00
740942d938
docker: rename repo
2019-11-15 10:45:27 +00:00
fcc4e4605f
Common nlog config
2019-11-15 11:47:56 +03:00
f07f71cf59
docker: add libgdiplus package
2019-11-14 14:29:17 +00:00
cb057a35ea
Merge branch 'master' into feature/asc-web-common
2019-11-14 16:39:54 +03:00
1f246aac8b
docker: add libgdiplus package
2019-11-14 13:32:24 +00:00
19acdd4a6e
web: Common: Init commit of new js library for common code of any App in AppServer
2019-11-12 14:55:22 +03:00
f1f313a1bf
docker: bug fix
2019-10-11 15:34:49 +00:00
54f3cc778d
docker: init commit
2019-10-08 15:00:41 +00:00
921d919485
publish: delete folder before run
2019-09-11 11:38:16 +03:00
57866b8ce3
win: init commit
2019-09-10 18:20:33 +03:00
01e2b38e5c
snap: delete obsolete files
2019-09-10 16:45:51 +03:00
297b91e560
add publish file
2019-09-10 16:40:33 +03:00
3718f92829
fixed STORAGE_ROOT path
2019-09-10 10:41:46 +03:00
0a5ef37043
Getting STORAGE_ROOT from env variable
2019-09-09 18:04:28 +03:00
025fa319ee
web: Removed ASC.Web.Storybook
2019-09-08 20:01:46 +03:00
3341b343d1
snap package: init
2019-09-04 15:33:02 +00:00
38b13e0d70
build run as admin
2019-09-03 14:12:19 +03:00
2aeec3ea68
web: New packages fixes
2019-08-29 16:23:47 +03:00
b2d5272658
web: components: Changed dist.package.json to dynamic creation of package.json by rollup-plugin: "rollup-plugin-generate-package-json"
2019-08-19 16:19:55 +03:00
79178a0edc
Changed folder for asc-web-components (npm-local/ -> packages/); Added react-calendar v2.13.2 (with important fix)
2019-08-19 13:30:18 +03:00
eec14c838b
build: Removed annoying reinstall npm-local
2019-08-02 14:07:07 +03:00
3036e1cb90
Added ASC.Studio.Notify service
2019-08-01 11:47:15 +03:00
62dee4b3bf
Added notify service
2019-07-29 12:15:48 +03:00
f9fe9daa48
build: Added removing npm-local and coping node_modules
2019-07-18 12:17:28 +03:00
973ea1cee7
build: Removed duplicated echo command
2019-07-18 11:13:54 +03:00
c1ea615a18
build: Added yarn link to asc-web-components
2019-07-18 10:57:35 +03:00
a7148cb793
npm install changed to yarn
2019-07-17 16:46:08 +03:00
28b8cb0dfe
Build: Added rebuild.bat
2019-07-16 12:48:05 +03:00
59d9d723ba
fix check
2019-07-16 10:32:09 +03:00
34c64aacca
fix check
2019-07-15 19:01:33 +03:00
d8eb13ec69
check tool
2019-07-15 18:54:19 +03:00
ff1d098eac
temp fix cra bug with public_url in development mode
2019-07-15 12:33:28 +03:00
26baaa8124
Build: removed building people client
2019-07-12 17:29:52 +03:00
355278cfd1
Requesting administrative privileges for install/uninstall/start/stop
2019-07-11 16:02:33 +03:00
5bd6bf7197
Server: remove watch(api/lock people)
2019-07-11 14:17:08 +03:00