|
|
46627f202c
|
Web: Moved translationKeys "EditButton" and "EditAvatar" to "/static/locales/{lng}/Common.json"
|
2021-05-20 14:11:27 +03:00 |
|
|
|
af2f24e4ac
|
Merge branch 'develop' into feature/translations
|
2021-05-20 13:11:13 +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 |
|
|
|
536c6c2f5e
|
Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
|
2021-05-19 11:14:44 +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 |
|
|
|
5f36009630
|
Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json"
|
2021-05-18 18:35:03 +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 |
|
|
|
df1ebc8d77
|
Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json"
|
2021-05-18 15:23:12 +03:00 |
|
|
|
f6ecc35ae7
|
Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json"
|
2021-05-18 15:10:20 +03:00 |
|
|
|
0ae236ad6d
|
Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json"
|
2021-05-18 14:42:44 +03:00 |
|
|
|
923f5012bc
|
Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json"
|
2021-05-18 14:35:54 +03:00 |
|
|
|
49780cee24
|
Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json"
|
2021-05-18 14:27:59 +03:00 |
|
|
|
99b86212dd
|
Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json"
|
2021-05-18 13:57:17 +03:00 |
|
|
|
08411cfc3b
|
Web: Moved translationKey "CloseButton" to "/static/locales/{lng}/Common.json"
|
2021-05-18 13:47:36 +03:00 |
|
|
|
35da962d06
|
Web: Moved translationKey "LoadingProcessing" to "/static/locales/{lng}/Common.json"
|
2021-05-18 13:40:32 +03:00 |
|
|
|
7a2167a0b9
|
Web: Rename translationKeys to Common "OKButton", "SaveButton" and "CancelButton" to "/static/locales/{lng}/Common.json"
|
2021-05-18 13:23:54 +03:00 |
|
|
|
629239fd9b
|
Web: Moved translationKey "OkButton" to "/static/locales/{lng}/Common.json"
|
2021-05-18 13:07:05 +03:00 |
|
|
|
cdb9ef6be9
|
Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json"
|
2021-05-18 10:56:24 +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 |
|
|
|
b91ddca880
|
Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json"
|
2021-05-17 12:08:57 +03:00 |
|
|
|
2beacfcf23
|
Web: Enabled Common.json translations loading
|
2021-05-17 11:19:38 +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 |
|
|
|
85bd971735
|
Merge branch 'develop' into feature/translations
|
2021-05-14 12:07:48 +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 |
|
|
|
67e166772c
|
Web: People: MyProfile: Added setModuleInfo
|
2021-05-13 18:20:24 +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 |
|
|
|
d7d22a9369
|
Web: People: Disabled editing of UserType and Group in MyProfile with action=edit
|
2021-05-13 13:43:45 +03:00 |
|
|
|
3db2963106
|
Web: People: Added transition back from MyProfile with action=edit
|
2021-05-13 13:08:30 +03:00 |
|
|
|
bb48586343
|
Web: People: Added transition back from MyProfile
|
2021-05-13 13:03:36 +03:00 |
|
|
|
f5b242e957
|
Web: People: Added transition to edit page from MyProfile
|
2021-05-13 12:56:11 +03:00 |
|
|
|
16deb72acc
|
Web: People: MyProfile refactoring
|
2021-05-13 11:26:55 +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 |
|
