e43445cb2d
Config: Enabled personal mode in appsettings.json
2021-06-02 16:17:23 +03:00
0aa6a71ea8
Merge branch 'develop' into feature/translations
2021-06-02 14:05:43 +03:00
e9c5ca41ae
fix
2021-06-02 11:26:58 +03:00
d3e30eeb6c
Config: Setup cultures
2021-06-01 20:11:01 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
7ae9b19412
Web: Turn on new languages >= 78%
...
1. Language 'de' translated by '90%'
2. Language 'fr' translated by '54%'
3. Language 'it' translated by '78%'
4. Language 'lo' translated by '78%'
5. Language 'pt-BR' translated by '78%'
6. Language 'ro' translated by '78%'
7. Language 'ru' translated by '99%'
8. Language 'sk' translated by '19%'
9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +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
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +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
8816e535c1
merge from develop
2021-04-28 19:50:59 +03:00
d97928fd37
Merge branch 'develop' into feature/support-hosting-as-service
2021-04-26 19:52:32 +03:00
4c500aef82
Config: added de-DE culture
2021-04-24 10:43:33 +03:00
fc297faa52
Merge branch 'develop' into feature/products
2021-04-23 17:35:11 +03:00
2d8b085d02
add support WindowsService/systemd for IHostBuilder
...
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +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
71baafe682
Reverted kafka config
2021-04-21 16:08:24 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
Alexey Kostenko
ef9fd0b9c0
Reverted kafka config
2021-04-08 12:00:57 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
NikitaVashchuk
6256c906f6
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
2021-04-05 18:29:13 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
Alexey Kostenko
042d93deec
Web: Added simple static file to getting a token of a third-party service
2021-03-29 18:15:10 +03:00
b8d484e62f
fixed locales
2021-03-23 21:10:47 +03:00
dde8f97cfd
Nginx: conf
2021-03-23 18:34:59 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +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
a015b618a2
Web: Client: Added new service-worker on workbox v6
2021-03-14 23:36:20 +03:00
c96e783eab
Web: Added new @appserver/editor app
2021-03-05 21:15:48 +03:00
35a4eca247
Web: Login: Fixed translation
2021-02-25 11:44:46 +03:00
083d25bcd6
CRM: продолжаю переносить проект
2021-02-24 19:50:07 +03:00
507fadff55
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.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/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/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.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/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/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
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
2021-02-24 10:57:03 +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
6c80ebdff0
Merge branch 'develop' into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
d8bd3f6e7c
Web: Files: Simplified translation
2021-02-19 21:57:01 +03:00
e97ba3a8b3
Web: People: Simplified translation
2021-02-19 19:27:13 +03:00
TatianaLopaeva
af5fd0a0cb
Added location for images from root into config. (onlyoffice.conf)
2021-02-19 14:41:19 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
ac51e3f7a3
Nginx: fix routing
2021-02-17 16:41:29 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
a12cf74638
fixed login handler
2021-02-10 22:43:18 +03:00
Sergey Kirichenko
4337130c5e
Modify file json format
2021-02-05 11:20:42 +03:00
61cfd029d9
Added CRM
2021-01-26 20:36:03 +03:00
9148527b90
Projects: fix
2021-01-26 20:09:50 +03:00
69922e7c48
Added ASC.Projects
2021-01-26 12:32:31 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
Ilya Oleshko
878ffa5e3b
Nginx: Added talk route, removed community
2021-01-25 14:27:13 +03:00
Ilya Oleshko
15429e78de
Nginx: Added community route
2021-01-25 12:46:49 +03:00
Ilya Oleshko
75873022ad
Nginx: Added routes for new modules
2021-01-25 11:42:29 +03:00
Sergey Kirichenko
08311a3c88
Fix problems with json format
2021-01-21 11:49:55 +03:00
bfa73ec5c2
moved from 2e37dcd0
2020-12-28 16:22:08 +03:00
babde5e603
Fix converter url
2020-12-12 14:11:35 +03:00
74b3777fe7
Config: Added url to local DocumentServer
2020-12-09 21:43:57 +03:00
141165903b
Test: fix
2020-11-16 17:58:27 +03:00
1c6c47cbf2
nginx: fix
2020-11-11 18:02:38 +03:00
e9b5992600
Fix PrivacyRoomController
2020-11-05 18:42:23 +03:00
8eeb2b3375
Nginx: fix files/thirdparty/capabilities
2020-11-03 12:23:17 +03:00
d1d01254a8
nginx: fix
2020-11-02 12:18:14 +03:00
SuhorukovAnton
a9b3fcd45b
nginx-config: update
2020-10-30 13:04:29 +03:00
SuhorukovAnton
3fc5188607
nginx-config: update onlyoffice.conf
2020-10-27 10:55:47 +03:00
SuhorukovAnton
aec80ae181
nginx: update onlyoffice.conf
2020-10-26 16:14:45 +03:00
358d53e2be
Merge branch 'master' into feature/files
2020-10-12 12:22:54 +03:00
a3f36c2796
Nginx: fix
2020-10-12 12:22:23 +03:00
17e0de56da
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-12 11:31:24 +03:00
bd822fedd0
ds-vpath rewrite
2020-10-09 22:40:06 +03:00
3e4219b20c
Merge branch 'master' into feature/files
2020-10-09 21:00:22 +03:00
9c7e979494
Config: internal path
2020-10-09 20:59:56 +03:00
ffa960617b
Merge branch 'master' into feature/files
2020-10-09 20:41:51 +03:00
26ac508aef
Config: internal path
2020-10-09 20:41:26 +03:00
e8c3b0f79f
Merge branch 'master' into feature/files
2020-10-09 20:27:08 +03:00
4759f8c90b
Config: internal path
2020-10-09 20:26:25 +03:00
Ilya Oleshko
05041a5a77
Config: Fixed database name
2020-10-09 13:26:17 +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
42e723ea49
Kafka: fix
2020-10-08 12:15:16 +03:00
Diana
2ceb82b458
flag to turn on/off migrations
2020-10-07 15:20:06 +03:00
Diana
04ee542f22
fix migrations, models, added migration and model schema TelegramDbContext
2020-10-01 20:08:55 +03:00
6bad98e277
Merge branch 'master' into feature/schema
...
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
140d57d5d4
Merge branch 'master' into feature/files
2020-09-30 18:28:27 +03:00
de03714d3d
Nginx: X-Frame-Options
2020-09-29 10:31:27 +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
e2c53e21d1
moved from release/11 4414f77b
2020-09-23 12:41:32 +03:00
0000129b3b
Merge branch 'master' into feature/release-11.0.0
...
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
9a092cb8ec
moved from release/11 4414f77b
2020-09-18 17:45:59 +03:00
TatianaLopaeva
a3adea3c27
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-09-15 17:39:34 +03:00
SuhorukovAnton
13edcd6a1a
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-15 11:26:43 +03:00
SuhorukovAnton
eb18133e4b
encryption: bugfix
2020-09-14 13:32:20 +03:00
15b34875d3
Moved from v10.5.2-saas
2020-09-11 17:12:35 +03:00
23b2a310a0
Merge branch 'master' into feature/files
2020-09-10 12:35:55 +03:00
SuhorukovAnton
7b1de6b36a
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-09 17:14:48 +03:00
a53cdc568d
Consumers: fix
2020-09-09 15:08:28 +03:00
SuhorukovAnton
ae61f59d55
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
2020-09-09 12:40:01 +03:00
886c7d6464
Merge branch 'master' into feature/files
2020-09-07 18:16:33 +03:00
96df0ab8ca
Api: added payment settings
2020-09-07 16:53:39 +03:00
Diana
463a73e22c
changed
2020-09-06 21:47:52 +03:00
Diana
23a832b834
changes
2020-09-05 22:19:25 +03:00
aa62721e73
EF: refactoring
2020-09-02 18:23:39 +03:00
SuhorukovAnton
15b17a0478
Encryption: first version
2020-09-02 13:54:50 +03:00
Diana
3668e4932a
choise between mysql and postgresql
2020-08-28 00:52:23 +03:00
Diana
7466aed406
choice between mysql and postgresql
2020-08-28 00:45:07 +03:00
5633d2467b
Merge branch 'master' into feature/files
2020-08-27 10:42:47 +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
Diana
bb5c2a23e7
postgree
2020-08-21 05:34:37 +03:00
15ba6828c5
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
2020-08-20 12:43:12 +03:00
f2a50f60e2
Settings: fix
2020-08-20 12:41:03 +03:00
SuhorukovAnton
4db1cd0af8
Merge branch 'master' into feature/socket.io
2020-08-14 14:01:27 +03:00
SuhorukovAnton
645b07b511
socket: bagfix
2020-08-14 13:56:15 +03:00
Ilya Oleshko
37fe1cab21
Merge branch 'master' into feature/files
2020-08-12 18:05:29 +03:00
Artem Tarasov
034d60707d
fixed link
2020-08-12 13:08:24 +03:00
cc50145275
Fix license path
2020-08-10 20:17:27 +03:00
Artem Tarasov
d463a4ab25
fixed bugs upload incorrect file license after upload current
2020-08-10 18:25:04 +03:00
Artem Tarasov
b8d42d53ed
fixed language
2020-08-07 22:02:55 +03:00
Artem Tarasov
3b8796ca93
refactoring
2020-08-07 13:39:53 +03:00
Artem Tarasov
c4ba6adee2
fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout
2020-08-06 00:01:41 +03:00
Artem Tarasov
555eac84b8
add method getIsRequiredLicense
2020-08-03 22:04:49 +03:00
178bf82c28
Settings: fix
2020-08-03 17:06:37 +03:00
SuhorukovAnton
3d8d378a90
socket.io: first version
2020-08-02 23:12:45 +03:00
72ae1f5e9b
Merge branch 'master' into feature/Wizard
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
2020-07-31 16:49:54 +03:00
Ilya Oleshko
fa8a0b92d8
Merge branch 'master' into feature/files
2020-07-31 15:05:58 +03:00
c325cb139d
Settings: added authproviders and login.ashx
2020-07-28 11:13:49 +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
ff41b28a64
DI: files fix
2020-07-16 12:08:20 +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
84ca1146a0
layout fix
2020-07-14 17:46:00 +03:00
2b6ef1e745
Merge branch 'master' into feature/files
2020-07-03 13:37:09 +03:00
ded7034ba7
Files: fix convert
2020-07-03 13:36:31 +03:00
87f85fdefe
Merge branch 'master' into feature/files
2020-06-29 09:53:07 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
...
Feature/backup
2020-06-28 16:23:36 +03:00
fd4a4c2aec
Merge branch 'master' into feature/files
2020-06-26 12:55:54 +03:00
36e0d6a200
Thumb: fix
2020-06-26 12:55:19 +03:00
943bd44458
Merge branch 'master' into feature/files
2020-06-26 12:41:45 +03:00
7cafc968eb
Thumb: fix
2020-06-26 12:40:46 +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
197f468bf7
Removed unused proto, added backup rewrite
2020-06-25 19:05:14 +03:00
SuhorukovAnton
103de233e9
Thumbnails: fix
2020-06-17 14:00:28 +03:00
38c40eec05
Merge branch 'master' into feature/backup
2020-06-15 18:40:26 +03:00
a05139202d
Merge branch 'master' into feature/files
2020-06-10 17:23:23 +03:00
2f8e09f915
fix
2020-06-10 17:22:48 +03:00
8c868252c5
Merge branch 'master' into feature/files
2020-06-10 11:50:34 +03:00
5aef887fe1
test: fix
2020-06-10 11:49:50 +03:00
4ea72a0e65
Merge branch 'master' into feature/backup
...
# Conflicts:
# ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
26f2107590
Backup: refactoring
2020-06-04 13:47:22 +03:00
SuhorukovAnton
89368aed8b
Backup: refactoring
2020-06-03 12:15:05 +03:00
SuhorukovAnton
1796c682a4
Backup: add backup.json and BackupSettings.cs, fix BackupWorker
2020-06-01 13:33:39 +03:00
4299f91ab5
Merge branch 'master' into feature/files
2020-05-22 12:54:19 +03:00
1700ba1965
UrlShortener: config
2020-05-22 12:41:14 +03:00
NikolayRechkin
055e7a61bd
Files: update appsettings.test.json
2020-05-21 15:59:00 +03:00
NikolayRechkin
47a45fe34f
Files: fix
2020-05-21 15:39:37 +03:00
NikolayRechkin
bbe6a16746
Files: update appsettings.test.json
2020-05-21 15:38:16 +03:00
Nikolay Rechkin
cbc0332919
Merge pull request #38 from ONLYOFFICE/feature/media-viewer
...
Feature/media viewer
2020-05-21 14:20:24 +03:00
NikolayRechkin
22c4af072e
Files: small fix
2020-05-21 14:19:36 +03:00
NikolayRechkin
57f48fbfc7
Files: updated a config
2020-05-21 14:18:05 +03:00
3fadf8db6c
fix log, added UrlShortenerService config
2020-05-21 11:03:35 +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
eef99a3e96
Files: ChunkedUploaderHandler
2020-04-20 11:08:04 +03:00
f5e90209b9
Files: fixed configs
2020-04-16 16:49:24 +03:00
1dbdb1aedd
Files: configuration
2020-04-15 18:39:59 +03:00
12436fb832
Files: FileHandler
2020-04-14 16:32:31 +03:00
NikolayRechkin
005d287f1e
Merge branch 'master' into feature/calendar
2020-03-06 10:02:14 +03:00
ef806e6c2b
Added url shortener service launcher
2020-03-05 14:55:12 +03:00
db5a4586f1
fixed test config
2020-03-03 17:27:32 +03:00
911662df96
removed files
2020-02-28 16:23:30 +03:00
NikolayRechkin
edf8915867
Merge branch 'master' into feature/calendar
2020-02-27 16:52:11 +03:00
190341c716
Files: renamed filescontroller
2020-02-27 11:22:42 +03:00
NikolayRechkin
c18543485b
Merge branch 'master' into feature/calendar
2020-02-26 14:46:42 +03:00
b0bb74d7ee
removed product
2020-02-26 13:02:26 +03:00
c1c8bab59d
Files: api
2020-02-26 13:01:12 +03:00
a78dad4064
web: files: Fixed proxy configure for images and socketjs
2020-02-26 11:04:26 +03:00
9800bfed8e
web: files: Added onlyoffice-files.conf
2020-02-26 11:03:13 +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
4ca24f0077
Files: Init Files.Client
2020-02-25 09:58:09 +03:00
7a8baecb2a
Files: ef, di
2020-02-19 11:37:52 +03:00
NikolayRechkin
be5e845438
init Calendar
2020-02-12 10:58:31 +03:00
c24d15806a
fix config
2020-01-31 10:58:22 +03:00
2782d9f64c
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# common/ASC.VoipService/Dao/VoipDao.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
8a931c29ae
Consumers: added config
2019-12-20 16:12:59 +03:00
89efaf9d26
Consumers: added config
2019-12-20 14:17:01 +03:00
61b4a295e3
EF: added support mysql 8.0
2019-12-18 15:25:32 +03:00
0d2da8219c
Nginx: fix
2019-12-11 18:36:51 +03:00
5ab0487e55
Nginx: public env
2019-12-11 18:15:10 +03:00
NikolayRechkin
858757fd86
PWA: renamed images for pwa
2019-12-11 15:18:55 +03:00
NikolayRechkin
c6ba00ae87
PWA: added update of cached items and the use of a fallback page
2019-12-11 12:41:22 +03:00
7185a54427
PWA: nginx conf
2019-12-05 18:26:43 +03:00
NikolayRechkin
c0c69badf3
first version of a progressive web application
2019-12-03 17:04:40 +03:00
162225a118
fixed config
2019-11-15 18:06:02 +03:00
fcc4e4605f
Common nlog config
2019-11-15 11:47:56 +03:00
503f163483
fixed mysql test settings
2019-10-08 22:39:00 +03:00
bc52b0508e
Revert "fixed test connection string"
...
This reverts commit f9b2ce01fc
2019-09-27 17:37:23 +03:00
f9b2ce01fc
fixed test connection string
2019-09-27 17:32:39 +03:00
18a9c846b8
Notify: added email sender
2019-09-25 13:36:22 +03:00
ed2caea266
fix config
2019-09-24 14:25:14 +03:00
12b6b06533
Config: added cultures
2019-09-23 16:22:14 +03:00
1b0f8617e1
Nginx: batch.json
2019-09-10 16:07:39 +03:00
422ed49134
Added storage route
2019-09-09 16:28:43 +03:00
6cae722b9d
kafka disabled by default
2019-08-23 15:49:23 +03:00
4095026a80
Nginx: gzip on
2019-08-21 15:31:31 +03:00
fbd1dc2e81
manifest.json
2019-08-21 11:00:22 +03:00
1a80a74abb
fix
2019-08-20 17:04:12 +03:00
9d342ddb67
Simplified nginx config
2019-08-14 16:55:56 +03:00
6e71569c12
web: People: Init translation
2019-08-13 17:48:04 +03:00
da510a0b4b
web: People: Added EmptyScreenContainer for empty filter results
2019-08-09 17:57:24 +03:00
b04e988717
Nginx: fix hot reload
2019-08-06 16:18:07 +03:00
d31470aaec
Nginx: fix routing
2019-08-06 14:27:19 +03:00
a4f523dccc
Api: gzip via nginx
2019-08-05 15:55:31 +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
6e500b0986
Upgrade .net core to 3.0.0-preview6
...
Added KafkaCache
2019-07-19 16:10:15 +03:00
5a820d8822
Nginx: group api rewrite
2019-07-19 11:19:23 +03:00
36136afe8d
Nginx: storybook
2019-07-15 16:57:53 +03:00
7f43d8d1ce
Nginx: refactoring
2019-07-15 14:45:07 +03:00
ff1d098eac
temp fix cra bug with public_url in development mode
2019-07-15 12:33:28 +03:00
735d3596fd
fix config
2019-07-10 16:49:03 +03:00
04b8fdce2a
Studio: client folder
2019-07-10 16:33:22 +03:00
38f61c3eb3
fix nginx
2019-07-10 16:20:01 +03:00
6ea8340a51
Nginx: includes
2019-07-10 14:57:30 +03:00
8f8d9c99fc
Products: fixed loading modules
2019-07-10 12:25:46 +03:00
2458bc2944
ASC.People project is divided into two separate parts: Server and Client
2019-07-10 11:21:12 +03:00
9e84b9f83e
Changed connectionString
2019-07-08 18:37:32 +03:00
0e08a11a7d
Added sockjs-node proxy (issue: not working HMR)
2019-07-08 12:22:03 +03:00
435e01833b
Removed unused headers
2019-07-08 10:37:24 +03:00
73ba76d57b
People as external product
...
nginx reverse proxy
2019-07-05 16:58:04 +03:00
811041e903
Added ResourceGenerator
2019-06-28 18:15:04 +03:00
73308504b3
Added ability to connect external products
2019-06-26 12:26:36 +03:00
48217aedd8
External config
2019-06-21 11:03:42 +03:00
