IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,711 Commits 40 Branches 22 Tags 420 MiB
5d38bd404b
Commit Graph

30711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sk81.biz@gmail.com
5d38bd404b Github action build from develop 2023-02-07 20:32:32 +03:00
Alexey Bannov
0f35b8ab45 redis: support User property from config 2023-02-07 17:53:34 +03:00
pavelbannov
b39b294920 fix 2023-02-07 14:46:24 +03:00
pavelbannov
c89b8ca427 Merge branch 'master' into develop 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
 2023-02-07 14:31:22 +03:00
Alexey Safronov
4a47e72a9a
Merge pull request #1173 from ONLYOFFICE/release/rc-v1.2.0 
Release/rc v1.2.0
 2023-02-07 13:45:23 +03:00
Timofey Boyko
dda05f7d7d Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-07 13:26:54 +03:00
Timofey Boyko
e0f2a397c4 Web:Client: fix translations for devices 2023-02-07 13:26:46 +03:00
Ilya Oleshko
0dd6985bd2 Fixed storybook run 2023-02-07 12:57:48 +03:00
Alexey Safronov
b378917502
Merge pull request #1172 from ONLYOFFICE/feature/update-readme 
Update README.md
 2023-02-07 12:54:01 +03:00
Kseniya Fedoruk
e9764904fb
Update README.md 2023-02-07 12:40:39 +03:00
Kseniya Fedoruk
3bfad2c234 Update README.md 2023-02-07 12:26:37 +03:00
gazizova-vlada
264f415dff Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-02-07 12:21:29 +03:00
gazizova-vlada
81e6c58cc1 Web:Client:Added that when opening the Accent and Buttons modal, the colors are displayed from the previously selected portal theme. 2023-02-07 12:20:31 +03:00
Ilya Oleshko
22eacf4fb8 Fixed Bug 61060 - Accounts: Error in console Uncaught TypeError: "newData" is read-only when deselecting account 2023-02-07 11:00:21 +03:00
Alexey Bannov
604bc27e88 files: added logs 2023-02-07 00:35:13 +03:00
Alexey Safronov
45b8e81a63 Web: Optimization of thumbnails creation 2023-02-06 23:05:57 +03:00
Alexey Safronov
8c18fb254d Fix TypeError: Cannot read properties of undefined (reading 'split') 2023-02-06 20:47:54 +03:00
Timofey Boyko
3dc7c23196 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-06 19:28:08 +03:00
Elyor Djalilov
3722ae1a77 Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization 2023-02-06 21:23:32 +05:00
Elyor Djalilov
0bfb980f99 Bug 61043 - Files. Unreadable characters instead of name in Author column and Info/History panel 2023-02-06 21:19:25 +05:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00
DmitrySychugov
f25abdc1ba Web: Components: added alignment for title media error 2023-02-06 19:51:53 +05:00
DmitrySychugov
b3d04ccd59 Web: Client: added media error ru translation 2023-02-06 19:50:55 +05:00
Ilya Oleshko
c97c281dea Web: Components: Toast: Fixed error toast with custom body 2023-02-06 16:35:50 +03:00
Ilya Oleshko
d3bed594a9 Web: Client: ChangeUserTypeEvent: Fixed client error message, added payments setting link 2023-02-06 16:33:40 +03:00
Ilya Oleshko
6fa291abce Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError 2023-02-06 16:32:29 +03:00
Ilya Oleshko
52fd2400e1 Web: Client: Locales: Payment: Added new key: QuotaPaidUserLimitError 2023-02-06 15:15:44 +03:00
Ilya Oleshko
33630ce818 Web: Client: ChangeUserTypeEvent: Added client error message 2023-02-06 15:15:08 +03:00
Ilya Oleshko
1b14e863b4 Web: Client: UsersStore: Fixed updateUserType action 2023-02-06 15:14:28 +03:00
Ilya Oleshko
ac7944370a Web: Client: Fixed Typo fixed 2023-02-06 15:13:36 +03:00
DmitrySychugov
2e2e6145d9 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-06 16:10:55 +05:00
DmitrySychugov
fa650bad45 Web: Client: added error media component 2023-02-06 16:10:43 +05:00
DmitrySychugov
321298d809 Web: Client: added en media error translation 2023-02-06 16:09:55 +05:00
Alexey Safronov
8916ecbffe
Merge pull request #1164 from ONLYOFFICE/bugfix/mediaviewer-primary-loading 
Bugfix/mediaviewer primary loading
 2023-02-06 13:34:31 +03:00
Alexey Safronov
65534fc670 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-06 13:23:29 +03:00
Alexey Safronov
73eb1a220e
Merge pull request #1166 from ONLYOFFICE/bugfix/ssr-translations 
Bugfix/ssr translations
 2023-02-06 13:00:09 +03:00
Akmal Isomadinov
33283cc63b Web:Components:Viewer:Sub-Components:Mobile-Viewer Fixed image size on mobile 2023-02-06 13:40:35 +05:00
gazizova-vlada
c38e0885a2 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-02-06 11:33:07 +03:00
gazizova-vlada
fac357c357 Web:Components:Adding Animation. 2023-02-06 11:32:19 +03:00
Timofey Boyko
ca973c0002 Merge branch 'bugfix/ssr-translations' of https://github.com/ONLYOFFICE/DocSpace into bugfix/ssr-translations 2023-02-06 11:32:10 +03:00
Timofey Boyko
6137e2a122 Web: remove before-build-webpack-plugin and apply custom plugin for create autoGeneratedTranlsations files 2023-02-06 11:32:02 +03:00
gazizova-vlada
538adba4cf Web:Client:Adding animation to files when updating a version higher than the second when downloading and converting. 2023-02-06 11:31:47 +03:00
Akmal Isomadinov
4f22a2a462 Merge branch 'bugfix/mediaviewer-primary-loading' of github.com:ONLYOFFICE/DocSpace into bugfix/mediaviewer-primary-loading 2023-02-06 12:35:30 +05:00
Akmal Isomadinov
7521acb1ad Web:Components:Viewer:Sub-Components:Viewer-Base Fixed image size 2023-02-06 12:35:02 +05:00
MaksimChegulov
17a625252b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-05 12:59:31 +03:00
Alexey Bannov
a82b390206 filessevice: added debug logs 2023-02-03 21:46:56 +03:00
Alexey Safronov
0c10732df8 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 20:22:39 +03:00
Alexey Safronov
fb74ebe991 Update yarn.lock 2023-02-03 20:14:18 +03:00
Alexey Safronov
313008a5e4 Update webpack.base.js 2023-02-03 20:14:12 +03:00
Alexey Safronov
f9d0c7f4f6 Merge branch 'release/rc-v1.2.0' into bugfix/ssr-translations 2023-02-03 19:51:54 +03:00