4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
2ee22ab052
Web: People: hide tfa settings if tfa dissabled
2021-05-19 18:51:32 +03:00
b9c52c526e
Fixed DistributedTask
2021-05-18 21:24:22 +03:00
1b4807c07a
Files: fixed SetTagsNew for thirdparty
2021-05-18 20:10:48 +03:00
2f7b9102ee
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
2021-05-18 20:06:42 +03:00
d9e17af9d5
OneDrive: fix DI
2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
...
Feature/remove wq
2021-05-18 19:04:34 +03:00
bc901b8a4a
Web: People: disabled user type change
2021-05-18 18:00:29 +03:00
2c6d06f304
Web: Files: fixed drag
2021-05-18 17:59:02 +03:00
9591974312
Web: People: reset tfa app
2021-05-17 23:29:03 +03:00
036a8595c2
Web: Files: fixed update badges new
2021-05-17 17:55:55 +03:00
002469c650
Web: Files: added progress to "mark as read" operation
2021-05-17 17:53:52 +03:00
ef8b4d8a3a
Web: Files: removed useless code, fixed getting file icons
2021-05-17 17:43:05 +03:00
4b1c067d34
Web: Files: fixed badge new translation
2021-05-17 17:41:35 +03:00
a98e12c2b7
Web: People: show tfa backup codes
2021-05-17 17:32:32 +03:00
36ce7a1b93
Web: People: fixed translations
2021-05-17 17:21:29 +03:00
0eb4f830d2
Web: People: fixed translates
2021-05-17 17:11:15 +03:00
8ba2d041f9
Merge branch 'develop' into bugfix/fixed-files-badges
2021-05-14 15:29:12 +03:00
31752e64b4
fixed warnings
2021-05-14 15:26:18 +03:00
0792920677
Web: Files: hid the edit icon if the file is locked
2021-05-14 14:11:16 +03:00
fe38eb0f44
Web: Files: fixed locked badge
2021-05-14 14:10:08 +03:00
eb628d3703
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
2021-05-14 11:34:10 +03:00
1a58007fcd
Web: Common: removed custom selection frame
2021-05-14 11:21:59 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
f4e8ddc33b
Merge branch 'develop' into bugfix/fixed-header-loader
2021-05-14 10:45:15 +03:00
359ead6b85
Files: added RecentSection, FavoritesSection
2021-05-13 20:25:49 +03:00
75a603f439
Web: Files: removed useless code
2021-05-13 15:39:44 +03:00
acccdfbda5
Web: Files: fixed setSelectedFolder
2021-05-13 15:39:18 +03:00
6867ded281
Merge branch 'develop' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/DIHelper.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
d5163fe61c
Web: Files: fixed closing MediaViewer
2021-05-12 16:08:20 +03:00
5a06c56d15
Web: Files: fixed remove media files
2021-05-12 14:23:18 +03:00
72ed5e031c
Web: Common: hide delete icon from MediaViewer for shared folder
2021-05-12 14:05:54 +03:00
9ea5a131e8
Web: Files: fixed MediaViewer crash
2021-05-12 11:55:34 +03:00
12e805fff7
Merge branch 'develop' into bugfix/fixed-description-for-download-as
2021-05-11 18:08:34 +03:00
fe2701740b
Web: Files: fixed description for action download as
2021-05-11 14:59:53 +03:00
888de70778
Web: Files: fixed ThirdParty connection settings
2021-05-11 14:31:45 +03:00
4dc54feb19
Web: Files: added loader to DeleteThirdPartyDialog
2021-05-11 14:29:17 +03:00
f0bb88da5f
Web: People: fixed incorrect user date of birth
2021-05-11 13:46:23 +03:00
c857751572
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
...
# Conflicts:
# yarn.lock
2021-05-11 12:22:17 +03:00
8f6bcf6e68
Web: Client scripts optimizations:
...
+ Fix deploy script (xcopy not installed issue)
+ Added concurrently for build and deploy scripts
+ Added new packages "mkdirp" (original "mkdir" not working with yarn run <script>), "rimraf"
+ Added missing "terser-webpack-plugin" package
2021-05-07 20:59:39 +03:00
3ae370deed
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-05-07 18:54:42 +03:00
6c3244a3e9
Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy)
2021-05-07 18:54:25 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
fc76758e65
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-07 11:01:36 +03:00
69fb32552a
Web: People: fixed InviteDialog z-index
2021-05-07 11:01:16 +03:00
0173c85c8f
fix Bug 50069
2021-05-06 20:59:27 +03:00
7670ea3e4c
Web: Files: fixed version history panel crash
2021-05-06 16:42:07 +03:00
95c9c9d1a3
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-06 16:30:31 +03:00
3a4ae6c041
Web: Files: fixed remove files from MediaViewer
2021-05-06 15:39:44 +03:00
a6064acce5
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-05-06 14:58:19 +03:00
