IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,369 Commits 38 Branches 22 Tags 359 MiB
f08679dd2d
Commit Graph

10083 Commits

Author SHA1 Message Date
Tatiana Lopaeva
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00
Tatiana Lopaeva
4463fc6e8f Merge branch 'develop' into feature/docspace-backup 
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
#	packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
#	packages/common/components/Loaders/AutoBackupLoader/index.js
#	packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
#	packages/common/components/Loaders/DataBackupLoader/index.js
#	packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
#	packages/common/components/Loaders/RestoreBackupLoader/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	products/ASC.Files/Server/GlobalUsings.cs
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/BackupStore.js
 2022-08-11 17:10:37 +03:00
Tatiana Lopaeva
c3252df9ec Web: Added prop type. 2022-08-11 15:55:46 +03:00
Tatiana Lopaeva
c39451a531 Web: Added room selection. 2022-08-11 15:54:12 +03:00
Alexey Bannov
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
Sergey Linnik
7b40920552 Chinese (Traditional, Taiwan) empty file templates 2022-08-02 17:41:42 +03:00
Sergey Linnik
3d531e653d Files: update docstore submodule (b8a2cf5292) 
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
 2022-08-02 17:41:04 +03:00
Pavel Bannov
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api 
Feature/fix api
 2022-08-02 11:59:47 +03:00
SuhorukovAnton
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
Alexey Safronov
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
pavelbannov
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
SuhorukovAnton
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
SuhorukovAnton
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
pavelbannov
d406e8deb5 Merge branch 'develop' into feature/pool-context 2022-08-01 13:14:47 +03:00
pavelbannov
b03f8bc1dc Merge branch 'develop' into feature/pool-context 2022-08-01 11:49:11 +03:00
Alexey Safronov
af8ebef56e Web: Removed ASC.Projects/Client 2022-07-31 13:16:31 +03:00
Alexey Safronov
2c5da93540 Web: Removed ASC.Mail/Client 2022-07-31 13:15:59 +03:00
Alexey Safronov
30031a8b52 Web: Removed ASC.CRM/Client 2022-07-31 13:15:29 +03:00
Alexey Safronov
0a3ddbdb10 Web: Removed ASC.Calendar/Client 2022-07-31 13:14:59 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
SuhorukovAnton
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
Tatiana Lopaeva
5651d3645e Web: Refactoring. 2022-07-28 15:50:09 +03:00
pavelbannov
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Alexey Safronov
53737a06e8 Merge branch 'develop' into refactoring/client 
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
 2022-07-28 10:38:29 +03:00
Tatiana Lopaeva
ddcde5f7ed Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection . 2022-07-27 18:29:27 +03:00
SuhorukovAnton
0c1ff6ffd7 union tests GetLink and ShareRoomByLink 2022-07-27 18:22:51 +03:00
MaksimChegulov
12e167ca84 Files: fix archive folder for WebDav 2022-07-27 17:34:10 +03:00
SuhorukovAnton
321e44cb94 fix SetFilterByTypes 2022-07-26 14:55:19 +03:00
SuhorukovAnton
9a8caeb951 backup: update thirdparty 2022-07-26 13:50:37 +03:00
Artem Tarasov
2988838060 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-26 12:32:41 +03:00
Tatiana Lopaeva
5dccd8f52c Web: Backup: Added direct third-party connection component. 2022-07-26 12:03:35 +03:00
Artem Tarasov
294cdf4881 Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr) 2022-07-26 11:19:01 +03:00
Artem Tarasov
9dcff71504 Web: Doceditor/Client: fixed share settings request (ssr) 2022-07-25 14:52:18 +03:00
pavelbannov
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
pavelbannov
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
pavelbannov
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
SuhorukovAnton
5877abf2e1 thirdparty backup: single connect 2022-07-24 22:19:36 +03:00
pavelbannov
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
Alexey Safronov
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
pavelbannov
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
pavelbannov
0a203dd532 Files: added new methods to api 2022-07-22 15:55:32 +03:00
SuhorukovAnton
7f7b636d9b fix get thirdparty/backup 2022-07-22 13:01:23 +03:00
TimofeyBoyko
d15e4be920 Web:Files:TableView: fix table columns for rooms 2022-07-22 05:20:30 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
TimofeyBoyko
5d327f39e4 Web:Files:FilesStore: remove delete context menu item for room 2022-07-21 14:00:14 +03:00