Commit Graph

10164 Commits

Author SHA1 Message Date
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
c0bf10af9e Files: fix 2022-08-10 22:27:44 +03:00
a63ee39d36 Files: removed unused method 2022-08-10 21:23:46 +03:00
69e5665763 Files: async fix 2022-08-10 19:45:59 +03:00
39c7a8ac2c Files: fix 2022-08-09 23:23:36 +03:00
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
05d5421ebc fix 2022-08-09 17:11:40 +03:00
baaec9dcef Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-09 16:27:35 +03:00
d679a3d9a7 Files: async fix 2022-08-09 16:09:14 +03:00
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
9149d08937 Files: async 2022-08-04 13:47:18 +03:00
ce1917c77f Async: refactoring 2022-08-03 17:29:20 +03:00
7b40920552 Chinese (Traditional, Taiwan) empty file templates 2022-08-02 17:41:42 +03:00
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
bb80d28945 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
2022-08-02 17:03:50 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
d406e8deb5 Merge branch 'develop' into feature/pool-context 2022-08-01 13:14:47 +03:00
b03f8bc1dc Merge branch 'develop' into feature/pool-context 2022-08-01 11:49:11 +03:00
af8ebef56e Web: Removed ASC.Projects/Client 2022-07-31 13:16:31 +03:00
2c5da93540 Web: Removed ASC.Mail/Client 2022-07-31 13:15:59 +03:00
30031a8b52 Web: Removed ASC.CRM/Client 2022-07-31 13:15:29 +03:00
0a3ddbdb10 Web: Removed ASC.Calendar/Client 2022-07-31 13:14:59 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
5651d3645e Web: Refactoring. 2022-07-28 15:50:09 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
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
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
0c1ff6ffd7 union tests GetLink and ShareRoomByLink 2022-07-27 18:22:51 +03:00
12e167ca84 Files: fix archive folder for WebDav 2022-07-27 17:34:10 +03:00
321e44cb94 fix SetFilterByTypes 2022-07-26 14:55:19 +03:00
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
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
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
5877abf2e1 thirdparty backup: single connect 2022-07-24 22:19:36 +03:00
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
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
0a203dd532 Files: added new methods to api 2022-07-22 15:55:32 +03:00
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
TimofeyBoyko
c954aa7f8d Web:Files:FilesStore: fix updateRoomPin for idx === -1 2022-07-21 13:09:40 +03:00
TimofeyBoyko
750ecd9e8e Web:Files:ContextOptionsStore: hide delete item from group context menu for rooms 2022-07-21 13:04:57 +03:00
TimofeyBoyko
77f8eecf78 Web:Files: fix header of context menu for rooms 2022-07-21 12:01:38 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
35cb3027b9 Web:Files: fix open archived room 2022-07-21 11:34:41 +03:00
TimofeyBoyko
1633d0782a Web:Files:TableView: fix view at room folder when info panel is open 2022-07-21 11:24:24 +03:00
TimofeyBoyko
af9011620d Web:People: update filter selected items 2022-07-21 10:43:08 +03:00
TimofeyBoyko
5926b22dbb Web:Files:Store: remove pin option from archived folder 2022-07-21 10:22:51 +03:00
TimofeyBoyko
602e4af0bb Web:Files: add group delete operation 2022-07-20 20:12:08 +03:00
TimofeyBoyko
799d1e7e81 Web:Files:Store: after click on pin/unpin update room icon before request is ready 2022-07-20 19:18:51 +03:00
TimofeyBoyko
59fb67d3d2 Web:Files:Filter: fix clear filter 2022-07-20 19:10:27 +03:00
TimofeyBoyko
8c1e727383 Web:Files: add default tag 'No tag' for empty tags list of rooms 2022-07-20 18:42:42 +03:00
TimofeyBoyko
73598dd0cd Web:Files:Article: fix translate key 'NewRoom' 2022-07-20 17:53:20 +03:00
TimofeyBoyko
6a2f6ff790 Web:Files:Filter: fix rooms search 2022-07-20 17:04:29 +03:00
TimofeyBoyko
c17aafd658 Web:Files:GlobalEvents: restore disabled buttons after onSave click 2022-07-20 16:45:50 +03:00
TimofeyBoyko
d2e3bd62f2 Web:Files:EmptyContainer: add onCreateRoom func 2022-07-20 16:36:06 +03:00
TimofeyBoyko
e505e0f812 Web:Files:TilesView: fix position of pin icon for rooms 2022-07-20 15:48:26 +03:00
TimofeyBoyko
1495775250 Web:Files: add new translation key 'NoTag' 2022-07-20 15:25:35 +03:00
TimofeyBoyko
3c199e43be Web:Files:Filter: add withoutMe logic for owner group and fix rooms filter type 2022-07-20 15:11:50 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
07425ded19
Merge pull request #728 from ONLYOFFICE/feature/rooms-filter
Feature/rooms filter
2022-07-20 15:17:12 +04:00
6ffa21a919 fix 2022-07-20 14:12:08 +03:00
TimofeyBoyko
6c47a7609d Web:Files:HOCs: disable create files and folders at rooms page 2022-07-20 12:49:33 +03:00
TimofeyBoyko
70948c081c Web:Files: add temp creating room dialog 2022-07-20 12:45:52 +03:00
TimofeyBoyko
54cf2a5ce4 Web:Files:ContextOptionsStore: add group context menu for rooms 2022-07-20 09:40:40 +03:00
TimofeyBoyko
3945c50662 Web:Files:FilesActionsStore: add changing pin to unpin item for group menu 2022-07-20 09:31:17 +03:00
TimofeyBoyko
04daf2b098 Web:Files:FilesActionsStore: add group operations for pin and archive rooms 2022-07-20 09:24:24 +03:00
TimofeyBoyko
58bbfb4d58 Web:Files: add new translation keys for pin/unpin and archive operations 2022-07-20 09:23:58 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
3123ba7993 Web: People: fix redirect 2022-07-20 00:49:11 +03:00
247bd5770f Merge branch 'develop' into feature/async-fix 2022-07-19 20:40:52 +03:00
TimofeyBoyko
7d13d8a81a Web:Files: add new translation key 'Owner' 2022-07-19 20:36:16 +03:00
TimofeyBoyko
d491829475 Web:Files:TableView: fix switch from room list to file list 2022-07-19 20:34:00 +03:00
TimofeyBoyko
3f8502ab8b Web:Files: add new translation keys for rooms 2022-07-19 18:39:44 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
mushka
676934f4d0 commented out print button in BackupCodes dialog 2022-07-19 17:54:15 +03:00
mushka
628959b1c4 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-19 17:47:54 +03:00
TimofeyBoyko
4f7a8e2074 Web:Files: update rooms translations keys 2022-07-19 17:47:42 +03:00
mushka
2f774803f4 added close button to Connecting account dialog 2022-07-19 17:47:17 +03:00
TimofeyBoyko
d6dd1c4639 Web:Files: add new translate keys for checked items of group menu 2022-07-19 17:41:26 +03:00
067e105814 Merge branch 'develop' into feature/modal-redesign 2022-07-19 16:58:02 +03:00