|
|
ce9f697d6e
|
Merge branch 'develop' into feature/restore-files-convertation
|
2021-06-01 10:52:07 +03:00 |
|
|
|
4cabbb7d52
|
Merge branch 'develop' into feature/11.5.2
|
2021-05-31 18:13:08 +03:00 |
|
|
|
afeec1942f
|
Files: fixed news request
|
2021-05-31 15:46:02 +03:00 |
|
|
|
0551bf6b98
|
Web: Files: moved convert dialog to store
|
2021-05-31 15:44:44 +03:00 |
|
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
|
1a6d18fcdc
|
Files: fixed start docs
|
2021-05-31 12:37:13 +03:00 |
|
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
|
|
72527ccded
|
Merge branch 'master' into develop
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-05-29 21:57:42 +03:00 |
|
|
|
d585c0a785
|
Web: Bumped version to 0.1.10
|
2021-05-29 21:26:13 +03:00 |
|
|
|
d0bbcb8d5a
|
Files: moved from 08a01422
|
2021-05-28 11:22:35 +03:00 |
|
|
|
bda786f844
|
WebStudio: moved from 08a01422
|
2021-05-27 20:13:24 +03:00 |
|
|
|
3cb0ff476c
|
Files: resources
|
2021-05-26 17:23:48 +03:00 |
|
|
|
d8adef733c
|
ASC.Files: moved from 08a01422
|
2021-05-26 16:54:46 +03:00 |
|
|
|
f6fbe33814
|
Web.Core: moved from 08a01422
|
2021-05-24 20:41:31 +03:00 |
|
|
|
90c67cac13
|
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
|
2021-05-24 13:26:13 +03:00 |
|
|
|
1b730233c9
|
ElasticSearch: moved from 08a01422
|
2021-05-23 19:11:25 +03:00 |
|
|
|
c1b7ea5a9a
|
Storage: moved from 08a01422
|
2021-05-21 16:26:42 +03:00 |
|
|
|
d83498f603
|
Web: Files: fixed tree menu update
|
2021-05-21 11:32:22 +03:00 |
|
|
|
f586f4d428
|
Web: Files: fixed crash page if folder doesn't exist
|
2021-05-21 10:30:22 +03:00 |
|
|
|
1f299420a1
|
Web: Files: added update tree menu
|
2021-05-21 10:29:58 +03:00 |
|
|
|
cec5dd3330
|
Web: Files: refactoring
|
2021-05-21 10:26:18 +03:00 |
|
|
|
3ace83bd61
|
Web: Files: fixed onFilesClick
|
2021-05-20 14:00:41 +03:00 |
|
|
|
ac976de0a5
|
Web: Files: fixed onFilesClick
|
2021-05-20 13:55:58 +03:00 |
|
|
|
cda77e1234
|
Merge branch 'develop' into bugfix/context-actions
|
2021-05-20 13:24:18 +03:00 |
|
|
|
f5372bbba8
|
Web: People: MyProfile: Fix translations loading
|
2021-05-20 11:45:13 +03:00 |
|
|
|
fc822e5ad5
|
Web: Fix setModuleInfo usage
|
2021-05-20 11:27:50 +03:00 |
|
|
|
3b7f1f60ec
|
Web: Files: fixed loopTreeFolders
|
2021-05-20 11:17:50 +03:00 |
|
|
|
5de1182bfa
|
Web: Files: fixed NewFilesPanel error
|
2021-05-19 18:55:12 +03:00 |
|
|
|
52750c607d
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
|
2021-05-19 18:14:40 +03:00 |
|
|
|
f04a4560b4
|
Web: Files: moved getNewFiles to actions
|
2021-05-19 18:14:35 +03:00 |
|
|
|
e268b077df
|
Web: Files: Store: Fixed displaying edit action for files with low access
|
2021-05-19 17:54:29 +03:00 |
|
|
|
666cc00a52
|
Web: Files: Store: Fixed copy action for shared files inside root. Added view action for edited files
|
2021-05-19 17:48:23 +03:00 |
|
|
|
03a71ae131
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
|
2021-05-19 17:11:46 +03:00 |
|
|
|
23c075859b
|
Web: Files: moved mark as read to actions
|
2021-05-19 17:11:10 +03:00 |
|
|
|
1003c6fe15
|
Web: Files: Dialog: Added unsubscribe action for DeleteDialog
|
2021-05-19 17:03:03 +03:00 |
|
|
|
e5f066e074
|
Web: Files: Store: Added unsubscribeAction for FilesActionsStore
|
2021-05-19 16:54:17 +03:00 |
|
|
|
cf49743054
|
Web: Files: Store: Added unsubscribe mark for Dialog
|
2021-05-19 16:53:32 +03:00 |
|
|
|
98d9fb4e33
|
Web: Files: HOC: Added unsubscribe action
|
2021-05-19 16:52:38 +03:00 |
|
|
|
e4f10d16cb
|
Server: Files: Controller: FilesController: Fixed model parse for delete share
|
2021-05-19 16:50:08 +03:00 |
|
|
|
2cd59d9014
|
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
|
2021-05-19 13:55:13 +03:00 |
|
|
|
d5ff576188
|
Web: Files: Store: Added mark read action, added remove from list and mark read icons
|
2021-05-19 13:54:45 +03:00 |
|
|
|
49e70d1ccc
|
Web: Files: removed useless code
|
2021-05-19 13:46:53 +03:00 |
|
|
|
536c6c2f5e
|
Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
|
2021-05-19 11:14:44 +03:00 |
|
|
|
86952dd71e
|
Merge branch 'develop' into bugfix/context-actions
|
2021-05-19 10:19:17 +03:00 |
|
|
|
3433c074d7
|
Merge branch 'develop' into feature/my-profile
# Conflicts:
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2021-05-19 10:16:40 +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 |
|
