Commit Graph

17312 Commits

Author SHA1 Message Date
Vashchuk Nikita
c74da79ba2 Merge branch 'develop' into feature/async
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.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/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-12 22:07:21 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
a91d767c66 Merge branch 'hotfix/v1.1.1' into bugfix/conversion-dialog-in-sorted-folders 2022-01-12 17:26:48 +03:00
Vashchuk Nikita
c778bb6db3 fix 2022-01-12 17:13:56 +03:00
332fc5866a Web: Files: Hide the file destination when checkbox is not set. 2022-01-12 17:09:21 +03:00
aba8cb9174 Web: Studio: fixed logo styles 2022-01-12 16:11:14 +03:00
2ffa9eb180 Web: Studio: added icons to header for desktop view 2022-01-12 15:53:52 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +03:00
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
5c5aac9244 Web:Files:Removed momentJS from DateCell and FilesRowContent components. Combined the getStatusByDate and getTableStatusByDate methods into the getStatusByDate method in the withContent HOC`s. Added parameters for the toLocaleString method in the getStatusByDate method. Replaced the comma from date string inside the getStatusByDate method. 2022-01-12 15:33:30 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
5bd347a775 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-12 12:58:07 +03:00
610c45fed3 analizators/U2U1009 2022-01-12 12:56:00 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
078e870f71 Web: Socket.IO: Fix reboot, logging, + refactoring (replaced WebSocketSharp to SocketIOClient) 2022-01-11 19:09:44 +03:00
d2fb921a7c Web:Files: Refactoring. 2022-01-11 18:59:35 +03:00
1941ceee28 Web: Files: Added toast for success conversion. 2022-01-11 18:48:09 +03:00
6ba659ac04 Web: Files: Added translations. 2022-01-11 18:43:43 +03:00
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
5fcf5cc1cc Files: copyas method now has "Password" param 2022-01-11 18:27:06 +03:00
8b9ea275de Web: Files: Renaming. 2022-01-11 17:08:42 +03:00
a87a1a22b5 Web: Files: Added information about file destination. 2022-01-11 17:05:36 +03:00
Vashchuk Nikita
e6f3c19b6e added async to ISecurityDao 2022-01-11 16:15:18 +03:00
0c341f0709 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2022-01-11 16:14:46 +03:00
15f15da4a0 Web: files: Added translations. 2022-01-11 15:46:53 +03:00
Dmitry Kulak
de8fdb748d Web: Studio: Header: Fixed spacing between burger menu button and logo 2022-01-11 14:37:11 +03:00
Artem Tarasov
ceb11e78ee Web: DocEditor: fix after merge 2022-01-11 14:13:26 +03:00
Artem Tarasov
6b954d45f5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/webpack.config.js
2022-01-11 14:11:47 +03:00
Artem Tarasov
7fc992c9f4 Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render() 2022-01-11 12:59:03 +03:00
Artem Tarasov
c7121997f3 Web: DocEditor: webpack.config.js is split into separate files 2022-01-11 12:57:07 +03:00
0246f10380 Web: People: fixed mobx warning 2022-01-11 12:35:53 +03:00
2fdb1fa746 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-11 12:35:01 +03:00
3565666fd2 Web: Table: fixed default columns size, fixed styles 2022-01-11 12:34:54 +03:00
ac157df98d Web: Files: The converted file does not appear in the sorted folders. 2022-01-11 11:17:06 +03:00
Dmitry Kulak
38e09fe63a Web: Studio: Header: Fixed margin for logo on Personal 2022-01-10 19:17:23 +03:00
d9619e1151 analizators/U2U1006 2022-01-10 18:13:54 +03:00
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
d3de3a11f2 Web:Files:Badges:Styling badges. 2022-01-10 18:08:56 +03:00
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
3522dea939 Web:Files:Badges:Fix props lineHeightBadge for table view. 2022-01-10 16:30:37 +03:00
3793c5ae43 Web:Components:Tree-Menu:Added props lineHeight for the badge in index.js for the tree-menu component. 2022-01-10 16:30:23 +03:00
c7bb1a51d5 Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card 2022-01-10 16:24:21 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +03:00
1d83359aa7 Web:Files:Badges:Added check for isTablet for tablet badges view. Added changing the font size of badges depending on the view. 2022-01-10 15:50:26 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
d7a1f73c48 analizators/s4035 2022-01-10 11:45:40 +03:00
579e867b2c analizators/s3168 2022-01-10 11:18:55 +03:00