Commit Graph

12216 Commits

Author SHA1 Message Date
f1ca0971fd crm: fixed work with sql queries 2021-05-15 17:42:16 +03:00
Artem Tarasov
6e5b34f4f7
Merge pull request #257 from ONLYOFFICE/bugfix/fixed-files-badges
Bugfix/fixed files badges
2021-05-14 16:36: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
Alexey Kostenko
059b43ea01
Merge pull request #256 from ONLYOFFICE/bugfix/enable-favorites-recent-settings
Bugfix/enable favorites recent settings
2021-05-14 13:12:38 +03:00
eb628d3703 Merge branch 'develop' into bugfix/enable-favorites-recent-settings 2021-05-14 11:34:10 +03:00
Artem Tarasov
7747bf50b1
Merge pull request #254 from ONLYOFFICE/bugfix/fixed-header-loader
Bugfix/fixed header loader
2021-05-14 11:32:29 +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
0d98b05210 Web: Files: fixed icons clickability 2021-05-13 16:57:10 +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
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +03:00
16deb72acc Web: People: MyProfile refactoring 2021-05-13 11:26:55 +03:00
28cbbc1671 Web: Added allowForMe for Route My 2021-05-13 11:26:11 +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
710e3db4c5 Web: People: Added new component "people/MyProfile" for users without "People" module access 2021-05-13 10:55:31 +03:00
d85f6c0c1c crm:refactoring 2021-05-12 20:58:22 +03:00
5747743641
Merge pull request #251 from ONLYOFFICE/bugfix/selectable-group-fix
Web: Common: fixed clickability for mobile devices
2021-05-12 17:14:37 +03:00
f05147eb29 Web: Common: fixed clickability for mobile devices 2021-05-12 16:53:40 +03:00
058096699f
Merge pull request #250 from ONLYOFFICE/bugfix/media-viewer
Bugfix/media viewer
2021-05-12 16:32:13 +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
55b3d86dba Web: Files: Store: Added open location for favorite folder 2021-05-12 11:37:28 +03:00
93677ecb9b Merge branch 'develop' into bugfix/context-actions 2021-05-12 10:52:58 +03:00
a3f00a2f63
Merge pull request #249 from ONLYOFFICE/bugfix/fixed-description-for-download-as
Web: Files: fixed description for action download as
2021-05-11 18:29:43 +03:00
12e805fff7 Merge branch 'develop' into bugfix/fixed-description-for-download-as 2021-05-11 18:08:34 +03:00
781a73384d
Merge pull request #248 from ONLYOFFICE/bugfix/tridparty
Bugfix/tridparty
2021-05-11 18:05:26 +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
3fa9e0659a Web: Files: fixed "Open folder" in the Recent folder 2021-05-11 14:12:08 +03:00
a89cace9b2
Merge pull request #247 from ONLYOFFICE/bugfix/fixed-incorrect-date
Web: People: fixed incorrect user date of birth
2021-05-11 14:00:31 +03:00
f0bb88da5f Web: People: fixed incorrect user date of birth 2021-05-11 13:46:23 +03:00
57a4b8a9b8 Upgrade lodash to version 4.17.21 (lodash vulnerability issue) 2021-05-07 21:12:25 +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
0feecdd27e v0.0.0 2021-05-07 19:46:22 +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