Commit Graph

7508 Commits

Author SHA1 Message Date
ebbe069621 edit tr 2021-12-07 16:59:01 +03:00
d12365b6fd edit pt 2021-12-07 16:58:39 +03:00
bdcb4cd0be moved from 51eb3d88 2021-12-07 16:56:16 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
659bb1492b add zh_CN 2021-12-07 16:45:05 +03:00
b6a963c712 add ko 2021-12-07 16:24:37 +03:00
06a478a499 add translations 2021-12-07 16:07:55 +03:00
65c6870e76 edit ro 2021-12-07 15:37:46 +03:00
c86b708cc8 edit zh_CN 2021-12-07 15:36:24 +03:00
c95aa3e29a add sl 2021-12-07 15:29:28 +03:00
dcdd1a5dc8 add sl 2021-12-07 15:27:11 +03:00
aba3e85932 add sl 2021-12-07 15:26:17 +03:00
cc4833f883 edit sl 2021-12-07 13:44:47 +03:00
8ef57f801d Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-07 13:42:16 +03:00
9339e2a53f edit Article 2021-12-07 13:41:56 +03:00
3586548859 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-07 13:11:56 +03:00
1c5f8568f0 Web: Files: SelectFileDialog: Fixed styles. 2021-12-07 13:11:31 +03:00
c5a089b782 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-07 13:04:13 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
7688eb29f9 edit translations 2021-12-07 13:02:35 +03:00
f9cf10afc5 edit files 2021-12-07 12:35:01 +03:00
c3c06e15fb edit files 2021-12-07 12:33:51 +03:00
2074c2f94d edit ja 2021-12-07 11:49:18 +03:00
78e36309e0 edit ja 2021-12-07 11:23:03 +03:00
83874a0eb8 edit cs 2021-12-07 11:19:20 +03:00
ac4e23553e add it 2021-12-07 11:08:55 +03:00
40692b3052 add zh_CN 2021-12-07 11:06:36 +03:00
1b0b978c97 add ja 2021-12-07 11:04:28 +03:00
a4d24aed65 Fixed Bug 54356 - Client.Files.FormTemplate. Fixed download dialog styles 2021-12-07 11:03:13 +03:00
2d86ede1bb add ja 2021-12-07 11:03:08 +03:00
bf7e54b7ee Web: files: SelectFileDialog: Fixed prop type. 2021-12-07 10:50:33 +03:00
7c703a5839 Web: Files: SelectFolderDialog: Removed extra space if there is one folder without subfolders. 2021-12-07 10:44:39 +03:00
98fa906954 Web:Files:Badges: Added favorite icons to appserver /public /images. Сhanged the onClickFavorite method in HOC withBadges. Changed the display of favorite icons. 2021-12-06 22:00:50 +03:00
7e538b9221 add az 2021-12-06 17:12:32 +03:00
08c0086208 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2021-12-06 15:18:39 +03:00
28fec434e6 Fixed Bug 53161 - Client.Files.Removed the narrowing of the line background when selecting. 2021-12-06 15:14:58 +03:00
4fef520aba Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-06 15:09:57 +03:00
3b11d8fa30 edit translations 2021-12-06 13:05:00 +03:00
8fd682ef5c edit translations 2021-12-06 13:04:09 +03:00
d9afc8ff4f Web:Files:Badges: Changed icons of the favorite, edit, lock. Changed the display of lock icons. 2021-12-05 16:37:33 +03:00
086cc8efd2 Web: Fixed format of searchParam for files selector 2021-12-03 18:41:57 +03:00
bff93c7141 moved from fc682b37 2021-12-03 18:28:20 +03:00
98a4ad4db0 Web: Files: Store: Removed file id encoding for creating form from file 2021-12-03 18:00:28 +03:00
b1417e68ea Files: fixed creating file from template in thirdparty 2021-12-03 17:38:13 +03:00
9ea13156cb Web:Files:Badges:SharedButton icon change, resize 2021-12-03 12:20:45 +03:00
01b46993e3 Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 18:52:10 +03:00
857c8f91d3 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 18:51:52 +03:00
67fdda2302 Web:Files:Badges: The Text tag has been removed from the SharedButton.
Replaced share-button className with share-button-icon in SimpleFilesRow, TableRow.
Changed styles of share-button-icon className in TableRow.
2021-12-02 18:05:52 +03:00
5590eca01e Web:Files:Badges:Functional badges, styles, moved from the FilesRowContent component to the SimpleFilesRow component.
HOC withBadges removed from the FilesRowContent component, added to the SimpleFilesRow component.
The SharedButton has been added to the Badges component, and the badge className has been added to the SharedButton. Removed SharedButton text.
2021-12-02 17:03:33 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
db16f4b2ec edit ru 2021-12-02 16:08:04 +03:00
c010fa4e69 update lo 2021-12-02 15:54:57 +03:00
318348737d update translations 2021-12-02 15:53:18 +03:00
65981155da Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-02 15:52:30 +03:00
8c750d6f17 edit ro 2021-12-02 15:51:59 +03:00
17c7a3b0eb Web: Files: Fixed editing form badge. Fixed icon. 2021-12-02 15:32:30 +03:00
fed3177aa0 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-02 14:34:14 +03:00
a2f26ee4b6 Web: Files: Store: Added encoding for string file id`s 2021-12-02 14:28:20 +03:00
83fad7a7c8 update ja 2021-12-02 13:49:27 +03:00
bc322380b6 update lo 2021-12-02 13:19:51 +03:00
e75031c7b8 Web: Files: Translations: Changed translations for form actions 2021-12-02 13:00:13 +03:00
c59c6edd66 add az 2021-12-02 12:55:41 +03:00
066ae39f5e add az 2021-12-02 12:48:07 +03:00
d181d43b36 Merge branch 'develop' into feature/async
# Conflicts:
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/ASC.Files.csproj
2021-12-02 12:02:50 +03:00
f3ec8d4926 Merge branch 'develop' into component-tooltips 2021-12-02 13:11:27 +05:00
0d98d5df42 Web: Files: added ButtonEdit translation, added badge edit title 2021-12-02 13:07:57 +05:00
af2f355e34 edit ru 2021-12-02 11:02:33 +03:00
1aeff5ef85 edit pt_PT 2021-12-02 10:53:54 +03:00
79e151e1e0 add pt_PT 2021-12-02 10:46:34 +03:00
ecac004a95 edit de 2021-12-01 18:56:28 +03:00
2de54722d6 Web: Files: added TitleShowActions and TitleShowFolderActions translations, added row and tile context menu titles 2021-12-01 17:17:12 +05:00
49a2dc7c24 Web: Files: Store: Fixed displaying make form action for privacy folder 2021-12-01 14:48:17 +03:00
f185b92d0c Web: Files: Header: Fixed form creating for privacy folder 2021-12-01 14:47:40 +03:00
aaf9acec35 Web: Files: MainButton: Fixed form creating for privacy folder 2021-12-01 14:47:18 +03:00
7f5bf2f65c add tr 2021-12-01 14:26:28 +03:00
5320d4cdf1 add pt-PT 2021-12-01 14:21:54 +03:00
9298919311 edit pt-PT 2021-12-01 14:20:48 +03:00
554235abcc add vi 2021-12-01 14:18:08 +03:00
Vashchuk Nikita
c6752d617e fix 2021-12-01 14:09:02 +03:00
b2a646177c add sl 2021-12-01 13:57:12 +03:00
9143e6af43 add sk 2021-12-01 13:44:20 +03:00
b517eac78c edit Translation 2021-12-01 13:35:20 +03:00
920cad4f70 add pt 2021-12-01 13:30:16 +03:00
bc232e937e add pl 2021-12-01 12:43:45 +03:00
f24a2c690e Web: Files: Download dialog: fixed dialog styles 2021-12-01 12:42:01 +03:00
160479aa27 add nl 2021-12-01 12:35:25 +03:00
d7f12761f9 Web: Files: Download dialog: fixed filename width 2021-12-01 12:25:16 +03:00
f6efa27440 add lv 2021-12-01 12:24:03 +03:00
2c51644c9c add ko 2021-12-01 12:07:49 +03:00
4072426185 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-01 12:06:41 +03:00
22d5a4ef01 add fi 2021-12-01 12:05:52 +03:00
1ea835b0bf Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-01 12:05:51 +03:00
6510142ed1 Web: Files: added new conversion format for docxf 2021-12-01 12:03:25 +03:00
71a5a3cb1a add cs 2021-12-01 12:01:30 +03:00
002af23d9b add ja 2021-12-01 11:26:35 +03:00
685fb5f196 edit fr 2021-12-01 11:16:28 +03:00
4c3845934f edit it 2021-12-01 10:55:33 +03:00
6ca4abf360 edit de 2021-12-01 10:51:35 +03:00
ac5cf8301f Web: Files: fixed SelectFileDialog tree-folders styles 2021-11-30 17:43:16 +03:00
02e5ef9bdc edit ro 2021-11-30 17:23:28 +03:00
db1d482fbc edit ru 2021-11-30 16:22:24 +03:00
3eb2ee20a8 add bg 2021-11-30 16:16:44 +03:00
40d6fcbf3b add uk 2021-11-30 16:15:55 +03:00
a9dc2a08da add zh-CN 2021-11-30 16:14:32 +03:00
Vashchuk Nikita
0d4af58ada fix 2021-11-30 16:03:23 +03:00
591809883f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-30 14:22:54 +03:00
5b0536d7d8 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 14:22:41 +03:00
1764ad579d Files: fixed migrations 2021-11-30 14:21:49 +03:00
2b7bc7fc1c Web: Files: added ButtonShareAccess translation, added share and row checkbox tooltip 2021-11-30 15:11:59 +05:00
7e2b2463ef add es 2021-11-30 12:36:57 +03:00
4c977206c9 Web: Files: added switchToThumbnails and SwitchViewToCompact translation, added view selector tooltip 2021-11-30 14:28:01 +05:00
27af300dd5 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 12:07:51 +03:00
db273f3b0e update translation (ro) 2021-11-30 12:04:41 +03:00
d8d36608ee update translation (ro) 2021-11-30 12:04:10 +03:00
c43e2843fe update translation (ro) 2021-11-30 12:03:33 +03:00
cf791ce250 update translation 2021-11-30 12:02:49 +03:00
e7028edeac Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-11-30 11:56:27 +03:00
d8e4880227 update translations 2021-11-30 11:56:02 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
0cefb001f1 Web: Files: disabled master form for privacy rooms 2021-11-30 11:44:11 +03:00
626ad87077
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
2021-11-30 11:36:23 +03:00
1551a484dc Web: Files: Renamed constant 2021-11-30 11:35:25 +03:00
3d361fe268 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-30 10:11:56 +03:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
425fe34629 Web: Files: Store: Added fetch items after call copyAsAction at store 2021-11-30 08:52:36 +03:00
fa40ca0e0d Web: Files: HOC: Added error catching for copyAsAction api 2021-11-30 08:51:32 +03:00
2b45442f29 Merge branch 'release/v1.1.0' into feature/make-form 2021-11-30 08:21:32 +03:00
5192da3ddf Files: added recent to openEdit 2021-11-29 21:42:42 +03:00
dec07c931c moved from d50a38db 2021-11-29 18:40:22 +03:00
d28cb30305 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-29 18:26:24 +03:00
fae03617d4 Web: Files: Fixed styles according of layouts. 2021-11-29 18:26:11 +03:00
26b00f9ee2 Merge branch 'release/v1.1.0' into feature/make-form 2021-11-29 17:58:41 +03:00
88c1f3271d Files: fix copyAs 2021-11-29 17:52:50 +03:00
f905ad0e23 Web: Files: Store/HOC: Added copyAsAction at store, fixed HOC action 2021-11-29 16:32:30 +03:00
3d5f3aa604 Web: Files: fixed display article panel 2021-11-29 16:30:52 +03:00
1be4134b7a edit vi 2021-11-29 16:15:07 +03:00
d53b130f35 edit cs 2021-11-29 16:02:06 +03:00
def7e82cc2 Web: Files: added TitleSelectFile translation, added group combo box title 2021-11-29 17:56:37 +05:00
40c3eb03c7 Web: Files: fixed aside scroll 2021-11-29 15:55:36 +03:00
cd6b3cab52 edit cs 2021-11-29 15:48:07 +03:00
148227cf99 edit cs 2021-11-29 15:44:48 +03:00
1870273c63 Web: Files: fixed "Create Master Form from file" dialog scroll styles 2021-11-29 15:28:29 +03:00
9746006457 Fixed Bug 54082 - Client.Files.Removed change of confirmation text. 2021-11-29 14:59:27 +03:00
c9b58cacd8 Web: Files: added MainHeaderSelectAll translation, added group menu checkbox title 2021-11-29 16:57:14 +05:00
850eb13b0d Merge branch 'release/v1.1.0' into feature/make-form 2021-11-29 14:20:02 +03:00
85316c9d63 Moved from 45122194 2021-11-29 14:11:03 +03:00
99c71148d8 Web: Files: fixed SharingPanel styles 2021-11-29 12:58:21 +03:00
d3071bcfb0 update translations 2021-11-29 12:53:44 +03:00
82a1458426 Web: Files: added MobileIos translation, added ios download tooltip 2021-11-29 14:48:47 +05:00
d5eebd25e5 Web: Files: added MobileAndroid translation, added android download tooltip 2021-11-29 14:34:41 +05:00
29da1ca281 Web: Files: added MobileLinux translation, added linux download tooltip 2021-11-29 14:22:04 +05:00
f759ddc295 Web: Files: added MobileMac translation, added mac download tooltip 2021-11-29 14:12:56 +05:00
ed7bb58c8d Web: Files: added MobileWin translations, added win download tooltip 2021-11-29 14:08:05 +05:00
e774dd0561 Web: Files: fixed modal dialog styles 2021-11-29 12:01:39 +03:00
4f4fd7811f Web: Files: fixed modal-dialog_file-name styles 2021-11-29 11:29:46 +03:00
653642e1b1
Merge branch 'develop' into feature/add-table-version 2021-11-26 18:23:49 +03:00
b716f95a71 Web: Files: fixed FilesListRow styles 2021-11-26 18:22:30 +03:00
3f56b01832 Web: Files: added margin to modal-dialog_file-name 2021-11-26 18:08:43 +03:00
084677dfcd Web: Files: Store/HOC: Added make form action 2021-11-26 17:37:38 +03:00
826b2928c3 Web: Files: fixed the selected folder in the tree for the dialog "Create Master Form from file" 2021-11-26 17:05:59 +03:00
0f833bd860 Web: Files: DeleteDialog: fixed dialog crash 2021-11-26 16:03:05 +03:00
27bcb67d84 Web: Files: added master form for empty folder screen 2021-11-26 15:57:29 +03:00
789ea1cbc7 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-26 15:48:00 +03:00
c965295d2f Web: Files: added copy external link icon 2021-11-26 15:41:19 +03:00
5288c96dd2 Web: Files: FilesPanel: Fixed translation keys 2021-11-26 14:51:57 +03:00
076cc463a0 Web: Files: MainButton: Fixed translation keys 2021-11-26 14:51:33 +03:00
d70ec139b7 Web: Files: Header: Added forms actions 2021-11-26 14:50:31 +03:00
f1fa0d6304 Web: Files: Locales: Moved keys for forms to common module translations 2021-11-26 14:49:51 +03:00
Vashchuk Nikita
365f1d4fa5 Merge branch 'develop' into feature/async 2021-11-26 12:47:48 +03:00
Vashchuk Nikita
79ac7232c2 Cleaned up the project, fix TagDao 2021-11-26 12:32:24 +03:00
fb637b43f1 Web: added version for table 2021-11-25 17:38:09 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
a046e5ac8d Web: Files: added icon button title prop, added connect tooltip 2021-11-25 18:47:09 +05:00
fde636c586 net 6: update packages 2021-11-25 16:41:24 +03:00
1e8bbfc743 Web: Files: added ButtonAddSkyDrive translation, added sky drive button tooltip 2021-11-25 17:21:54 +05:00
c7e4da933e Web: Files: added ButtonAddNextcloud translation, added nextcloud button tooltip 2021-11-25 17:12:58 +05:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
5e1a7c4032 Web: Files: added ButtonAddDropBox translation, added drop box tooltip 2021-11-25 16:17:23 +05:00
bd9687c60d Web: Files: added ButtonAddBoxNet translation, added box button tooltip 2021-11-25 15:12:09 +05:00
7d66e16e1d Web: Files: added ButtonAddGoogle translation 2021-11-25 14:54:32 +05:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +03:00
49897b0617 update docxf and oform with embedded mime type 2021-11-25 11:07:32 +03:00
1d7d29039f Store updated 2021-11-25 10:29:27 +03:00
4273c519e0 Files: dispose custom ResponseStream 2021-11-25 10:02:52 +03:00
c1f9bcc445 Web: Files: Store: Disabled form filling for external access sharing 2021-11-25 00:11:29 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
4155dfde5c Fix Bug 53418 - Client.Files.Drag’n’drop. Fixed dragging file by filename 2021-11-24 14:17:11 +03:00
838e734078 Web: Files: removed useless code from withBadges HOC 2021-11-24 14:15:32 +03:00
d572debd4e Web: Files: Store: Fixed ‘Fill in the form’ context menu item for the .oform format in the Trash folder. 2021-11-24 13:02:19 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
b99b3d8ca5 Web: Files: fixed file loader after closing ConflictResolveDialog 2021-11-24 11:58:02 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
b35061d327 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2021-11-23 14:38:03 +03:00
2678c8cf6e Fixed Bug 53123 - Client.Files.Added a filter at the stage of creating a file or folder. 2021-11-23 14:37:48 +03:00
4b5af5912c Web: People: fixed row-checkbox styles 2021-11-23 12:30:55 +03:00
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +03:00
a50d35e30a Fixed Bug 53901 - Client: Upload.There will be not a border line after clicking on SVG element. Tooltip will not be selected. 2021-11-23 10:23:05 +03:00
Vashchuk Nikita
8edd757c82 added async in api Files 2021-11-22 16:17:27 +03:00
ff6986ddb1 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 14:50:11 +03:00
3bee202d41 Web: Files: Replaced translation on common. 2021-11-22 14:23:45 +03:00
38feb79725 Web: Fixed aside loader. 2021-11-22 14:18:46 +03:00
2b84cd3f63 Web: Files: Fix translation 2021-11-22 13:03:16 +03:00
e883e86e64 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:47:45 +03:00
228394727e Web: Styles: Fixed styles. 2021-11-22 11:43:37 +03:00
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +03:00
3bd204cbdb Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:29:07 +03:00
3417cb28f4 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:25:49 +03:00
05c96e140a Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:22:25 +03:00
470fd7ffcb Web: People: MainButton: Added missing actions 2021-11-22 11:21:58 +03:00
1004ed5dfb Fixed Bug 53415. Fixed save button 2021-11-22 11:20:01 +03:00
ca60cc8e0a Web: Files: Replaced translation to Common 2021-11-22 11:18:36 +03:00
b6f98f9531 Web: Files: Added missing mobile translations 2021-11-22 11:17:33 +03:00
2e58ea6061 Web: Files: removed useless code. 2021-11-22 10:19:49 +03:00
b632f3a623 Web: Fixed styles according layouts, renaming. 2021-11-22 10:15:24 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	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-11-21 14:40:24 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	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-11-21 14:26:20 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
56ecbc95ea Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:18:13 +03:00
e7f92b096c Web: Added new translation and files for another languages. 2021-11-19 18:17:46 +03:00
180ca914ad Web: Files: HOC: Fixed form icon inside context menu 2021-11-19 18:08:11 +03:00
677263354f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:01:56 +03:00
4b095ecdd6 Web: People: MainButton: Reworked data model for button items 2021-11-19 18:01:47 +03:00
922622676c Web: Files: MainButton: Reworked data model for button items 2021-11-19 18:01:34 +03:00
8e88d27340 Web: Files: Article: Added translations for sub-level menu 2021-11-19 18:00:40 +03:00
4cd9d042de Web: Files: fixed styles after Cherry picking. 2021-11-19 16:58:31 +03:00
4ccc19981b Web: Files: Force loading dialog translations. 2021-11-19 16:10:24 +03:00
50fb593b39 Web: People: Changed Email Dialog according to layouts. 2021-11-19 16:09:41 +03:00
9608cabeb0 Web: People: Forced download of translations. 2021-11-19 16:08:17 +03:00
5b98387057 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 14:26:01 +03:00
0c09d46eca Web: Removed warnings. 2021-11-19 14:12:16 +03:00
638f6b6ddb Fixed Bug 53878 - Client: Check box. Fixed checkbox clickability 2021-11-19 13:44:41 +03:00
839d81f356 Web: Files: Added "Fill in the form" context menu action from ".ofrom" files 2021-11-19 13:25:09 +03:00
ce41e5d4cb Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 12:58:03 +03:00
8a0b29c12b Web: Files: Added '.oform' files edit icon + update access.edit.react.svg 2021-11-19 12:57:56 +03:00
1b9b7e163d Web: Files: Article: Fixed translate file 2021-11-19 12:55:38 +03:00
c63ad1792f Web: Files: Fixed document filtering by extension in the file selection dialog. 2021-11-19 12:12:54 +03:00
2356ace636 Web: Files: Fixed the name of the created docx file from the existing file. 2021-11-19 12:09:18 +03:00
4732b8c16b Fixed Bug 53879 - Client: Check box. Fixed reset of file selection 2021-11-19 11:35:26 +03:00
3dcebb924d Web: Deleted useless code. 2021-11-19 10:29:21 +03:00
981dede88a Files: fixed creating link 2021-11-18 20:42:36 +03:00
7a2e48d066 Web: People: fix translations 2021-11-18 19:10:51 +03:00
ac09d3691d Web: People: fix translations 2021-11-18 19:03:24 +03:00
27c731dbb3 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53453 2021-11-18 18:40:29 +03:00
9ad5e54c1d Files: optimization 2021-11-18 18:32:12 +03:00
65a82827a0 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-18 18:21:30 +03:00
d5fb86fd41 Web: Files: delete useless 2021-11-18 17:47:11 +03:00
c3cc75401c Web: Files: fix comment 2021-11-18 17:41:38 +03:00
ce528338b8 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151 2021-11-18 17:39:27 +03:00
8c8bf95fae Web: Files: fixed empty trash 2021-11-18 17:39:12 +03:00
68ab26ed6d Web: Files: Fixed loaders. 2021-11-18 16:21:28 +03:00
594b767a3d Web: Files: Fixed loaders according layouts. 2021-11-18 15:26:48 +03:00
407e4db69c Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53453 2021-11-18 14:53:24 +03:00
26d5de5c93 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151 2021-11-18 14:52:57 +03:00
783eb2295b Files: added CanWebRestrictedEditing and CanFillForms 2021-11-18 12:53:31 +03:00
3dbb55cfc4 Web: Files: Removed global changes of tree when changes local tree at file dialog. 2021-11-18 10:45:36 +03:00
ea27fb433b Web: fixed modal dialog styles. 2021-11-18 10:28:36 +03:00
3a866b14bb Web: Fixed styles of aside files list. 2021-11-18 10:24:51 +03:00
8ff0bbba61 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-18 10:02:47 +03:00
eaa7bd9c80 Web: Fixed translations according layouts. 2021-11-18 10:01:09 +03:00
2a842cc401 Web: Files: Remove extra padding for folder dialog. 2021-11-18 09:29:12 +03:00
d113abe541 Web: Files: Fixed translation for file dialog. 2021-11-18 09:16:40 +03:00
68d889fb2b Web: Fixed can create in editor dialog, changed translation, added buttons of selection folder for files dialog. 2021-11-18 09:06:03 +03:00
92cd04914a
Merge pull request #459 from ONLYOFFICE/bugfix/loader-for-file-operations
Bugfix/loader for file operations
2021-11-17 19:32:50 +03:00
cd698e56bb Web: Files: fixed clearActiveOperations 2021-11-17 19:00:38 +03:00
e6f008cc6f Web: Files: Store: Added convert map docx to docxf 2021-11-17 18:16:23 +03:00
0e7aee7918 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 18:11:27 +03:00
fb903bd9bf Web: Files: Store: Added new formats inside document constant 2021-11-17 18:11:18 +03:00
84439d98e1 Web: Files: delete action 2021-11-17 17:43:27 +03:00
4894779a17 Web: Files: add restore all 2021-11-17 17:42:59 +03:00
017b9e912c Web: Files: add menu in trash 2021-11-17 17:41:46 +03:00
b5fa787353 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 17:41:27 +03:00
7560d4aae5 Web: Files: Added new form from file. 2021-11-17 17:39:56 +03:00
5f4a1c5f40 Fixed Bug 51982 - Client.Sort. Fixed filter pageCount 2021-11-17 17:26:20 +03:00
8546bc2662 Web: Files: Home: Fixed translate file 2021-11-17 17:15:28 +03:00
9bbaf3f4a7 Web: Files: refactoring file loader 2021-11-17 17:01:46 +03:00
bc4758114f Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 16:48:29 +03:00
cc4d835335 Updated forms 2021-11-17 16:43:29 +03:00
625e76eab0 Web: Files: fixed finished for loopFilesOperations 2021-11-17 16:42:39 +03:00
c4fd5b3626 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-17 16:40:45 +03:00
e1a248ae7c Web: Files: Store: Added new data parameters 2021-11-17 16:39:38 +03:00
635dc7c7aa Web: Files: Store: Added new formats inside constants 2021-11-17 16:39:10 +03:00
166cca86c6 Web: Files: Helpers: Added title for new forms 2021-11-17 16:38:26 +03:00
2f7b465cea Web: Files: Home: Added translation key for new form file 2021-11-17 16:37:46 +03:00
0fd5c2b67f Web: Files: renamed isDisabled to inProgress 2021-11-17 16:33:25 +03:00
02c21e50ea Web: Files: added file loader for emty trash operation 2021-11-17 16:29:47 +03:00
79cf36a41c Web: Files: Fixed tree opening. 2021-11-17 16:28:31 +03:00
e5d045c090 Web: Files: Added select file dialog to the main menu. 2021-11-17 15:46:35 +03:00
36050dd6c9 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Article.json
2021-11-17 15:45:19 +03:00
4ed98eccbb Web: Files: added files loader for download operation 2021-11-17 15:35:22 +03:00
6a319d9bf8 Web: Files: Fixed styles according the layouts. 2021-11-17 15:33:43 +03:00
d081a79cfa Web: Files: fixed files loader when api crashed, added display toast for delete operation 2021-11-17 15:08:43 +03:00
7dfa5c1891 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53453 2021-11-17 14:05:10 +03:00
b102011139 Web: Files: Added button mane prop. 2021-11-17 13:09:54 +03:00
2d4d0a0f81 Web: Files: fixed select loaded files 2021-11-17 13:02:07 +03:00
f3732fcfb5 Web: Files: added timeout for set active files 2021-11-17 12:07:06 +03:00
af55b39eab Web: Files: Added select file dialog to the panels. 2021-11-17 11:47:00 +03:00
8751294e63 Web: Files: added file loader 2021-11-17 11:08:25 +03:00
19c925fcbf Web: Files: Fixed aside panel. 2021-11-17 10:13:58 +03:00
e704f2f127 Web: Files: Added new foldersType, removed saving folder to store. 2021-11-17 09:56:04 +03:00
99f73e8aee Web: Files: Added translations for files dialog. 2021-11-17 09:53:41 +03:00
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
e0f297bf0a Web: People: add translations 2021-11-16 18:24:02 +03:00
4af7032a9a Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons. 2021-11-16 16:40:27 +03:00
93b22e1fe0 Web: Files: fixed setActiveFiles/setActiveFolders 2021-11-16 16:28:24 +03:00
79c06534d5 Web: Files: added loader for delete operation 2021-11-16 14:46:22 +03:00
8a4a625609 Web: Files: fixed file operations with conflicts 2021-11-16 12:49:08 +03:00
f236eacf66 Web: Files: added loader for file operations 2021-11-16 12:46:26 +03:00
d403fa1dcd Web: People: removed log 2021-11-15 18:37:29 +03:00
7ca1a18a37 Web: People: added translations for column position 2021-11-15 18:35:08 +03:00
adbb316dd2 Web: moved "Owner" translation to Common 2021-11-15 18:33:32 +03:00
13fdab9e1f Web: Files: fixed markAsRead action 2021-11-15 17:55:02 +03:00
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +03:00
d6836cc3d3
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
2021-11-13 20:04:11 +03:00
cd21a4013d Web: Restored missing translations 2021-11-13 19:15:50 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
478ca3215b Web: Restored missing translations 2021-11-12 21:53:28 +03:00
9eb6c04a5a Web: Removed useless translation keys 2021-11-12 21:52:47 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
d45f863f64 Web: Files: Fix showing success operation toast on empty trash 2021-11-12 20:45:31 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
400612f9ff Web: Files: fixed checkUpdateNode 2021-11-12 17:22:17 +03:00
63aee3fd73
Merge pull request #456 from ONLYOFFICE/bugfix/fixed-tree-menu-class-list
Web: Files: moved the tree id from classname to dataset
2021-11-12 16:44:50 +03:00
b5b61c4385 Web: Files: fixed tree folders drag 2021-11-12 16:16:17 +03:00
3c0b1a410e Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-12 17:50:05 +05:00
77de50578d Fixed bug 53531 - Web: Files: added toastr when we delete a file or folder 2021-11-12 17:49:50 +05:00
0bd634dd16 Web: Files: added className for tree root folders 2021-11-12 15:36:56 +03:00
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +03:00
eb5f69213e Web: Files: Settings: added className to TreeSettings 2021-11-12 14:33:32 +03:00
3363cb4111 Web: added className to MainButton 2021-11-12 14:17:20 +03:00
9b6d9dac6f Web: People: added classNames for MainButton items 2021-11-12 14:13:47 +03:00
8910f4446a Web: Files: added className for MainButton items 2021-11-12 14:13:29 +03:00
549a0abe99 Web: Files: moved the tree id from classname to dataset 2021-11-12 12:25:28 +03:00
ea1a64cbab Web: Files: fixed addNewFile 2021-11-11 18:41:09 +03:00
967d6123a1
Merge pull request #455 from ONLYOFFICE/bugfix/fix-diplay-converted-files
Fixed Bug 53633 - Client: Files. Fixed display of files after conversion
2021-11-11 18:29:39 +03:00
40fb928ee7 Fixed Bug 53633 - Client: Files. Fixed display of files after conversion 2021-11-11 17:40:50 +03:00
ae0a437474 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-11 19:25:50 +05:00
4c55228f73 Fixed bug 53162 - Web: Files: fixed context-menu-wrapper padding since row was shifted 2021-11-11 19:25:39 +05:00
2b5e4bad38 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-11 15:37:31 +03:00
2ea63910a2 Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids 2021-11-11 15:37:23 +03:00
0fdb4a3218 Web: Files: fix memory leak 2021-11-11 14:32:13 +03:00
80d6b801eb Web: Files: fix upload panel loading button 2021-11-11 14:24:22 +03:00
0006d428e3 Web: Files: fixed update tree nodes 2021-11-11 12:21:43 +03:00
b34d8091f3 Web: Files: fixed error notifications for upload panel 2021-11-11 12:10:39 +03:00
84add544f9 Web: Crm: Changed i18n config 2021-11-10 21:27:02 +03:00
6b299a48e3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-10 21:25:08 +03:00
0f2b65c215
Merge pull request #438 from ONLYOFFICE/bugfix/sharing-panel
Bugfix/sharing panel
2021-11-10 21:24:19 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
09520f60fb Web: People: fixed styles 2021-11-10 13:59:34 +03:00
0b13f992bd Web: Files: fixed upload 2021-11-09 18:24:16 +03:00
6de5f819ae Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-09 17:55:35 +03:00
51fec4ff31 Web: Files: Fixed error for getting subfolders of root 2021-11-09 17:54:26 +03:00
75828a376d Files: added GetThumbnailAsync 2021-11-09 17:31:19 +03:00
Artem Tarasov
8ddf907338
Merge pull request #452 from ONLYOFFICE/bugfix/fix-tile-view-styles
Web: Files: fixed TileContainer styles
2021-11-09 16:48:04 +03:00
4e78e46125 Web: Files: fixed TileContainer padding 2021-11-09 16:20:32 +03:00
33944ccb3e Web: Files: Fixed delete operation without modal dialog. 2021-11-09 15:52:17 +03:00
86269ab984 Web: files: Added new selection for delete operation. 2021-11-09 15:23:42 +03:00
e7845b2152 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
2021-11-09 15:16:08 +03:00
1d8fa34930 Web: Deleted useless code. 2021-11-09 15:13:37 +03:00
de49f86398 Web: Files: fixed TileContainer styles 2021-11-09 15:12:24 +03:00
4d5aef2163 Web: Files: Deleted useless code. 2021-11-09 13:49:30 +03:00
44a101beae Web: Refactoring, added bufferSelection. 2021-11-09 13:47:55 +03:00
3af660cc09 Web: Files: Fixed moving through the context menu. 2021-11-09 12:58:35 +03:00
b7053a84eb Web: Files: Deleted useless code. 2021-11-09 10:43:46 +03:00
bde5936da8 Merge branch 'hotfix/v1.0.1' into bugfix/last-page-operations 2021-11-09 10:40:14 +03:00
1a8e0156fe WebL Files: Deleted useless code. 2021-11-09 10:32:32 +03:00
aa3aff1516 Web: files: Removed a blank page when restoring files from the recycle bin. 2021-11-09 10:29:34 +03:00
57f65b437a Web: files: Function transfer. 2021-11-09 10:27:09 +03:00
df09343eb4 Web: Files: fixed Tile styles 2021-11-08 16:35:17 +03:00
8e001cdb9f Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-08 15:52:54 +03:00
56d16ac2f4
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
2021-11-08 15:38:45 +03:00
2a1adf83e7 Web: About: Fix UselessTranslationKeysTest translation issue 2021-11-08 15:37:34 +03:00
5c5db26dc4 Web: Files: removed unused code 2021-11-08 14:04:52 +03:00
ffddbbe1ba Web: Files: added tree menu update 2021-11-08 13:52:18 +03:00
c30597f0e2 Web: Files: Removed empty page when deleted all files at last page. 2021-11-08 13:39:19 +03:00
eeb9e3ebff Service: fix memory after crop 2021-11-06 23:11:18 +03:00
47d8fbc1d9
Merge pull request #448 from ONLYOFFICE/feature/desktop-login
Feature/desktop login
2021-11-03 18:43:23 +03:00
2fd09a649c Web: Removed state change. 2021-11-03 17:11:48 +03:00
1bc1d22d17 We: Files: Moved the code into separate functions. 2021-11-03 16:55:33 +03:00
70bdfa5c27 Web: Files: Fixed memory leak. 2021-11-03 16:28:44 +03:00
d55bf01070 Web: Files: Removed the blinking of the selected folder when opening the sharing panel. 2021-11-03 16:27:24 +03:00
f1f42a88ae Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-03 15:44:23 +03:00
daf75937a4 Web: Files: fixed upload folder 2021-11-03 15:42:23 +03:00
836b71719d Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel 2021-11-03 13:58:46 +03:00
44db3cbb13 Web: Files: disabled button only for personal 2021-11-03 13:58:28 +03:00
94fbdfae44 Web: Files: fixed upload to tree menu 2021-11-03 13:50:44 +03:00
bc765dfb70 Web: Files: fixed upload convertFiles 2021-11-03 12:57:35 +03:00
49a0490df7 Web: Files: fixed updating the folder tree after upload 2021-11-03 12:30:15 +03:00
72adefec39 Web: Deleted useless code after Cherry Pick. 2021-11-03 10:35:03 +03:00
6cb9b40d51 Web: Files: Disabled the restore and download buttons while the comment is saved. 2021-11-03 09:58:37 +03:00
bea2e04f39 Web: Files: Deleted useless file. 2021-11-03 09:58:37 +03:00
2b9b62ab97 Web: Files: Deleted useless code. 2021-11-03 09:58:37 +03:00
b35c9b6922 Web: Files: Disabled save and cancel buttons when is saving comment.
# Conflicts:
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
2021-11-03 09:58:36 +03:00
ee0e64365a Web: Fixed styles. 2021-11-03 09:57:57 +03:00
4bac9baaeb Web: Files: Remove color flicker loader on instant restoration of history. 2021-11-03 09:57:56 +03:00
06437454a8 Web: Deleted useless code. 2021-11-03 09:57:55 +03:00
d427eeb5ed Web: Refactoring. 2021-11-03 09:57:54 +03:00
3aa117ce99 Web: Deleted useless code. 2021-11-03 09:57:53 +03:00
4160ddcf69 Web: Files: Removed the jump to the beginning of the list when the recovery process is over. 2021-11-03 09:57:52 +03:00
033b958081 Web: Files: Refactoring. 2021-11-03 09:57:52 +03:00
bb4aa7d550 Web: Files: Fixed showing not version badge after scrolling. 2021-11-03 09:57:52 +03:00
e25759e4b6 Web: Files: Added re-render rows when is process restoring for disable rows. 2021-11-03 09:57:52 +03:00
9c8d0dae82 WEb: Files: Added variable size list for version history. 2021-11-03 09:57:51 +03:00
6cf7c6d43e Web: Common: PageLayout: Refactoring, deleted useless code.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:57:51 +03:00
e2c435d3a6 Web: Files: Fixed styles for version history panel. 2021-11-03 09:57:12 +03:00
76b4251559 Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:57:12 +03:00
77271fabe3 Web: Files: VersionHistory: Fixed styles for version history, added blocked interactions with version histories during restore.
# Conflicts:
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
2021-11-03 09:55:39 +03:00
44f2a1c17f Web: Common: Fixed styles for body list without scroll.
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 09:54:16 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
2bafe9c7c0 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:13:39 +03:00
21419325be Web: Files: fixed updating the folder tree after upload 2021-11-02 15:42:49 +03:00
96d12d3afc Web: Files: fixed updating the folder tree after upload 2021-11-02 15:26:43 +03:00
Vashchuk Nikita
999f50f4ae added Linq.Async to ASC.Files.Core 2021-11-02 15:12:28 +03:00
fc28c971c8 Web: Files: fixed upload folder hierarchy 2021-11-02 14:43:15 +03:00
5ba3df944c Web: Files: fixed upload folder hierarchy 2021-11-02 14:21:45 +03:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
4e018d2d71 Web: Bump version to 1.0.1 2021-11-02 14:02:46 +03:00
93fae1580e Web: Files: fixed files upload 2021-11-02 13:14:52 +03:00
a106c6ae1c Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel 2021-11-02 12:57:34 +03:00
b5c506b7a4 Web: Files: fix isUpdated sharing panel 2021-11-02 12:57:17 +03:00
fc93266964 Web: Files: fixed folder update after upload 2021-11-02 10:54:35 +03:00
b681b8225e Files: added feature for remove elastic 2021-11-01 17:31:22 +03:00
89391ab385
Merge branch 'develop' into bugfix/tooltip 2021-11-01 15:02:25 +03:00
e6628c4963 Merge branch 'hotfix/v1.0.1' into feature/files-upload 2021-11-01 14:08:44 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
cf3c74c50f Fixed Bug 53081. Fixed dragging thirdparty folder 2021-11-01 13:19:16 +03:00
3da81e5f16
Merge branch 'develop' into bugfix/tooltip 2021-10-31 18:35:22 +03:00
4243922078 Web: Client: EditingWrapperComponent: Fixed enter press event 2021-10-29 18:33:55 +03:00
508dcb4856 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-29 17:41:21 +03:00
c0f0e73d2c Web: Client: EditingWrapperComponent: Fixed checking relatedTarget inside event on blur 2021-10-29 17:41:11 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
6aa8281ea7 Web: People: add space in tooltip translate 2021-10-29 16:44:48 +03:00
795da675b7 fix Bug 53436 2021-10-29 16:37:51 +03:00
19252882ed Web: Files: delete useless 2021-10-29 16:29:18 +03:00
34e163aac4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tooltip 2021-10-29 13:20:28 +03:00
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
73a810fb43 Elastic: fixed files query 2021-10-28 20:02:22 +03:00
b30ae58185 Web: Files: fixed upload folder hierarchy 2021-10-28 16:44:46 +03:00
42dab36a34 Web: Files: fix set state 2021-10-28 16:36:58 +03:00
b72ef82341 Web: Files: fixed folder upload 2021-10-28 16:30:00 +03:00
d6336a0292 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel 2021-10-28 15:27:06 +03:00
de2be37d24 Web: Files: fix max width tooltip 2021-10-28 15:07:13 +03:00
1a404a3f0f Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab. 2021-10-28 14:57:53 +03:00
0d6cacb1b7 Web: Files: fixed onBackToParentFolder 2021-10-28 13:50:04 +03:00
c16bfd98a4 Fix bug 53336: empty tab when sharing via email 2021-10-28 12:15:35 +03:00
a1d8a700c0 Web: Files: fixed Paging re-render 2021-10-28 12:11:53 +03:00
dcb8f108b8 Web: Files: fixed Paging re-render 2021-10-28 11:30:23 +03:00
6d62e54813 Web: Files: fixed files upload if filter is set 2021-10-28 10:57:15 +03:00
71ad551bb8 Web: Files: disable button on mobile panel 2021-10-27 21:35:46 +03:00
22e764b376 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel 2021-10-27 21:30:43 +03:00
361e6bccf5 Fix bug 53335: disable button in sharing panel 2021-10-27 21:30:27 +03:00
ca52c409c2 Web: Files: fixed folders upload 2021-10-27 20:41:54 +03:00
f923786cf4 Web: Files: fixed upload 2021-10-27 19:55:21 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
93545f04fa Web: Files: fixed files upload 2021-10-27 19:16:06 +03:00
1a5e098c80 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-panel 2021-10-27 11:21:45 +03:00
0dbf4bca55 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344 2021-10-27 11:17:31 +03:00
b7bf07cc92 Web: Files: fix clear selection 2021-10-27 11:16:52 +03:00
cece18f0e7 Merge branch 'release/1.0.0' into bugfix/icons-blur 2021-10-26 16:56:35 +03:00
f5d31dcff2 Web: Files: Fixed icons blur, added new icons 2021-10-26 16:55:52 +03:00
9128a3d0ff Web: Files: Added docxf and oform format icons 2021-10-26 16:55:09 +03:00
cb8bc701ec fix migrations 2021-10-26 16:14:40 +03:00
9d62a39ea7 Web: Files: reset selection on fetch 2021-10-26 16:14:04 +03:00
629d22b4cd Web: Files: fix selection after delete 2021-10-26 15:57:25 +03:00
7745ec214b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344 2021-10-26 15:01:55 +03:00
51312c813f Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-10-26 14:50:33 +03:00
9d0de00fac Fix Bug 53332 - Client.Files. ‘Warning. Bad request’ on .fb2 sharing on personal 2021-10-26 14:50:25 +03:00
5a75cd893a Fix bug 53344: file selection after restore 2021-10-26 13:21:51 +03:00
e29b8f5b0e Merge branch 'release/1.0.0' into bugfix/Bug-53346 2021-10-26 11:00:17 +03:00
6f921f249f Fixed Bug-53346: Added tree expansion when opening the folder where the file is located. 2021-10-26 10:59:34 +03:00
73cddf6da2 Fix bug 53337: open new tab via share twitter 2021-10-26 10:48:50 +03:00
b1134d239c Merge branch 'develop' into feature/auto-migrations
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UserDbContext.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
2021-10-25 20:52:13 +03:00
e04190acc5
Merge pull request #425 from ONLYOFFICE/bugfix/redesign-sharing-panel-desktop
Bugfix/redesign sharing panel desktop
2021-10-25 20:19:00 +03:00
5ecd932939
Merge pull request #422 from ONLYOFFICE/bugfix/fix-file-creation
Web: Files: fixed files creation
2021-10-25 17:50:14 +03:00
0c5717a895 Web: Files: fixed onKeyUpUpdateItem 2021-10-25 17:44:56 +03:00
886944eb2e Fixed Bug 53150 - Client.Files. Fixed creation of multiple folders 2021-10-25 17:17:12 +03:00
7739606140 Merge branch 'release/1.0.0' into bugfix/Bug51497
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
2021-10-25 16:58:34 +03:00
b756de0122 Web: Files: Added loading in the current tab from the loading panel. 2021-10-25 16:43:24 +03:00
884b812430 Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab. 2021-10-25 15:53:07 +03:00
b3747a92a4 Merge branch 'develop' into feature/wizard/migration 2021-10-25 14:54:05 +03:00
fc53f350cd Web: Files: fixed getting playlist 2021-10-25 14:31:20 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
fa39817631 Fixed Bug 53333 - Client.Files. Fixed opening media files from upload panel 2021-10-25 14:25:51 +03:00
Artem Tarasov
2517f0be67 Merge branch 'release/1.0.0' into bugfix/redesign-sharing-panel-desktop 2021-10-25 14:07:59 +03:00
Artem Tarasov
12845ab89d Web: Files: SharingPanel: fixed toggle button margin 2021-10-25 14:07:07 +03:00
f715d15473 Merge branch 'develop' into feature/net6 2021-10-25 14:03:31 +03:00
Artem Tarasov
275dc977d6 Web: Files: SharingPanel: fixed footer style 2021-10-25 13:49:42 +03:00
Artem Tarasov
cbd868ab36 Web: Files: SharingPanel: fixed body and rows style 2021-10-25 13:17:38 +03:00
ff4e73a54d Files: update migrations 2021-10-22 20:11:03 +03:00
be2be3d47c Web: Files: fixed files creation 2021-10-22 18:46:35 +03:00
3ae83ff00c Web: Files: fixed TableRow background styles 2021-10-22 16:12:25 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
1e15174d23 Web: Files: fixed styles after merge 2021-10-22 15:01:43 +03:00
72d972d8fb Web: People: Changed styles to match layouts. 2021-10-22 14:19:57 +03:00
6d7f8574fe net6: update packets 2021-10-22 13:28:48 +03:00
b73680260f Merge branch 'release/1.0.0' into bugfix/section-header 2021-10-22 13:03:55 +03:00
c163576b8b Web: Files: Fixed styles for section header for tablet/mobile view. 2021-10-22 13:03:17 +03:00
Artem Tarasov
2739a254fc Web: Files: SharingPanel: fixed row height in SharingPanel 2021-10-22 12:51:54 +03:00
5bd9c06c1a Merge branch 'develop' into table-group-menu
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
4f6477c85e Fixed Bug 53276 - Client.Files.Download. Fixed download single files without conversion 2021-10-22 11:15:17 +03:00
1d49d85e23
Merge pull request #415 from ONLYOFFICE/bugfix/files-loader
Bugfix/files loader
2021-10-22 10:47:31 +03:00
522a55f02c Web: Files: Fixed hiding context-menu before displaying share panel 2021-10-22 10:17:42 +03:00
bc0e35dc97 Web: Files: Added opportunity to open SharingPanel in module mode on personal desktop and tablet 2021-10-22 10:17:22 +03:00
3a33cf8d3a Merge branch 'release/1.0.0' into bugfix/files-loader 2021-10-22 10:11:53 +03:00
a6a0ce4106 Web: Files: Fixed jumps of the filter loader. 2021-10-22 10:11:23 +03:00
94a466ed48 Merge branch 'release/1.0.0' into develop
# Conflicts:
#	packages/asc-web-components/aside/aside.js
2021-10-22 09:02:39 +03:00
Vashchuk Nikita
4ef5b4c8e5 Added async in Asc.Files.Core(Dao) 2021-10-21 20:59:05 +03:00
effe9ce9fa Web: Files: fixed drag 2021-10-21 19:20:04 +03:00
576c62e337
Merge pull request #400 from ONLYOFFICE/bugfix/tile-view
Bugfix/tile view
2021-10-21 19:16:16 +03:00
81019049d7
Merge branch 'develop' into feature/personal-share-dialog 2021-10-21 19:14:59 +03:00
Artem Tarasov
9bc6cc3c51 Web: Files: TilesView: fixed position of checkbox 2021-10-21 18:24:07 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
556059437d Web: Files: Fixed hiding context-menu before displaying share panel 2021-10-21 17:53:28 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
d6da7a7fb2
Merge pull request #411 from ONLYOFFICE/bugfix/scrollbar
Bugfix/scrollbar
2021-10-21 16:15:24 +03:00
c2d0ff17d0 Merge branch 'develop' into table-group-menu 2021-10-21 15:34:57 +03:00
Artem Tarasov
d1baceb64f Web: Files: TilesView: fixed position checkbox on mobile 2021-10-21 15:23:40 +03:00
94bd11930c
Merge pull request #406 from ONLYOFFICE/feature/avatar-edit-action
Feature/avatar edit action
2021-10-21 15:15:43 +03:00
Artem Tarasov
27eff81dbc Merge branch 'release/1.0.0' into bugfix/tile-view 2021-10-21 15:14:58 +03:00
Artem Tarasov
489506a42f Web: Files: TilesView: fixed styles 2021-10-21 15:13:28 +03:00
25b59177d8 Web: Files: disable aside scroll in Upload Panel 2021-10-21 15:05:13 +03:00
e88a5b6af4 Web: Files: Disabled the restore and download buttons while the comment is saved. 2021-10-21 14:13:39 +03:00
bc48169e75 Web: Files: Deleted useless file. 2021-10-21 14:03:36 +03:00
081ab8ff3e Web: Files: Deleted useless code. 2021-10-21 13:56:36 +03:00
3a2111bfe4 Web: Files: Disabled save and cancel buttons when is saving comment. 2021-10-21 13:56:02 +03:00
c61e42e771 Web: Fixed styles. 2021-10-21 13:47:14 +03:00
ac0e803072 Web: Files: Remove color flicker loader on instant restoration of history. 2021-10-21 13:11:09 +03:00
0844c3491b Merge branch 'develop' into table-group-menu 2021-10-21 12:34:28 +03:00
cc9857c904 Web: Deleted useless code. 2021-10-21 12:29:25 +03:00
e13f3869f8 Web: Fixed after merge. 2021-10-21 12:24:24 +03:00
30f8385466 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/scrollbar 2021-10-21 12:24:16 +03:00
44f5f05ae6 Web: Refactoring. 2021-10-21 12:21:10 +03:00
152207d85a Merge branch 'develop' into bugfix/version-history-list
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
2021-10-21 12:02:57 +03:00
Artem Tarasov
96d92d9b6a
Merge pull request #407 from ONLYOFFICE/feature/create-files-without-submit
Web: Files: added file creation after focus loss
2021-10-21 11:40:15 +03:00
85c96024cd Web: Files: fixed convert files upload 2021-10-21 11:30:40 +03:00
0990af91a9 Web: Deleted useless code. 2021-10-21 11:07:22 +03:00
087c7af06c Web: Files: Removed the jump to the beginning of the list when the recovery process is over. 2021-10-21 10:55:11 +03:00
Artem Tarasov
623f451696 Web: Files: VersionHistory: fixed width of VersionHistoryPanel 2021-10-21 10:10:49 +03:00
aadf41f44d Web: Files: fix scrollbar in upload panel 2021-10-20 18:44:14 +03:00
18be8a7cff Web: Files: Added opportunity to open SharingPanel in module mode on personal desktop and tablet 2021-10-20 17:48:07 +03:00
Artem Tarasov
04778445dc Merge branch 'bugfix/tile-view' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2021-10-20 16:56:50 +03:00
Artem Tarasov
17a31e8513 Web: Files: TableView: fixed position of image in row 2021-10-20 16:51:47 +03:00
7fffe69143 Web: Files: Refactoring. 2021-10-20 16:21:20 +03:00
Artem Tarasov
23b30f5d8d Web: Common: PageLayout: table style fix 2021-10-20 15:52:02 +03:00
b00836cc46 Web: Files: Fixed showing not version badge after scrolling. 2021-10-20 15:36:14 +03:00
03aae77431 Web: Files: delete log 2021-10-20 17:22:04 +05:00
6e58edd5aa Web: Files: Added re-render rows when is process restoring for disable rows. 2021-10-20 15:13:52 +03:00
3f2839f315 WEb: Files: Added variable size list for version history. 2021-10-20 15:11:19 +03:00
fa12a2be1c Web: Files: fixed folder actions after merge develop 2021-10-20 16:47:59 +05:00
26956a9ba1 Web: Files: added file creation after focus loss 2021-10-20 12:58:11 +03:00
392122ae39 Web: Files: fix files operation 2021-10-20 12:41:34 +03:00
80d9471f7a Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view 2021-10-20 12:15:00 +03:00
15ddc24309 Merge branch 'develop' into bugfix/folder-header-menu 2021-10-20 13:27:14 +05:00
cee21c2df0
Merge pull request #403 from ONLYOFFICE/bugfix/get-fileops
file api: get file operation status 100 only if Result field is not null
2021-10-20 11:24:02 +03:00
f35ea7d172 Web: People: delete useless 2021-10-20 11:21:28 +03:00
0a2e2d1ffc Web: Files: fixed table container group menu styles 2021-10-20 10:58:25 +03:00
Artem Tarasov
ba5bcda891 Web: Files: TilesView: fixed font and icon size 2021-10-20 10:57:30 +03:00
951593bbe4
Merge pull request #405 from ONLYOFFICE/bugfix/bug-53122
fixed bug 53122
2021-10-19 22:32:30 +03:00
191ddfabc4 fixed bug 53122 2021-10-19 21:34:09 +03:00
aa69a52272 fix test 2021-10-19 20:29:45 +03:00
7d511385bc removed unused references 2021-10-19 19:08:47 +03:00
01da3ea518 Files: fix 2021-10-19 18:37:23 +03:00
8422e1a555 file api: get file operation status 100 only if Result field is not null 2021-10-19 18:36:30 +03:00
5a47095182 fix 2021-10-19 18:34:59 +03:00
5a5e299d98 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
8ad7ebaba6 Web: Files: fix padding 2021-10-19 18:12:48 +03:00
1c7d4a9714 Web: Files: fix condition 2021-10-19 17:55:05 +03:00
f04a1a5403 Web: People: fixed table group menu, added new icons 2021-10-19 17:36:47 +03:00
017d3675a5 Files: removed unused code 2021-10-19 15:49:52 +03:00
30f089e9b7 Merge branch 'develop' into table-group-menu 2021-10-19 15:44:29 +03:00
3ea9f1ff20 Web: Files: delete useless 2021-10-19 15:42:03 +03:00
4e6593c080 Web: Files: fix storage download 2021-10-19 15:22:52 +03:00
0440f26bbc Web: Files: replacing selection with buffer selection in folder menu 2021-10-19 16:17:49 +05:00
9735000d64 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view 2021-10-19 14:10:32 +03:00
5a3b7fdc6c Web: Common: PageLayout: Refactoring, deleted useless code. 2021-10-19 13:58:55 +03:00
c7a1ef34c8 Web: Files: Fixed styles for version history panel. 2021-10-19 13:43:34 +03:00
b82dc5bf91 Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles. 2021-10-19 13:41:52 +03:00
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
9514fb2ce7 Web: Files: VersionHistory: Fixed styles for version history, added blocked interactions with version histories during restore. 2021-10-19 12:22:16 +03:00
30dc2623ba Web: Common: Fixed styles for body list without scroll. 2021-10-19 12:18:07 +03:00
691cbf1d06 Web: Files: fix checkbox and icon align 2021-10-19 12:08:53 +03:00
d91ad66a67 Web: Files: added delete dialog when we delete a folder via the folder menu 2021-10-19 14:03:20 +05:00
d99dfecba3 Fixed Bug 53155: Cannot set properties of undefined (setting 'isFolder') 2021-10-19 11:51:06 +03:00
49f9798907 Web: Files: align checkbox on tile 2021-10-18 17:41:50 +03:00
f35787fea0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/tile-view 2021-10-18 16:07:36 +03:00
5b64a6174c Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-18 17:18:21 +05:00
36206576e8 Web: People: fixed table styles 2021-10-18 14:30:49 +03:00
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
0af3d7cc90
Merge pull request #399 from ONLYOFFICE/bugfix/bug-53106
fixed bug 53106
2021-10-18 14:19:46 +03:00
ed10d59870 Web: Files: fixed TableGroupMenu onChange 2021-10-18 14:16:56 +03:00
d6f1570fa2 fix Bug 53052 2021-10-18 14:07:48 +03:00
e8f535d710 Web: People: fixed table styles 2021-10-18 13:11:26 +03:00
0c63c41ef7 Web: Files: changed folder icons, added new icons 2021-10-18 12:24:01 +03:00
36b13211fa Web: Components: fixed table styles, fixed table, refactoring 2021-10-18 12:22:33 +03:00
67179fd267 Merge branch 'release/1.0.0' into table-group-menu 2021-10-18 10:53:09 +03:00
4fc807590d Web: Files: fixed the background for the selected element after a second click 2021-10-18 10:52:13 +03:00
f3796d1d56 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-18 10:36:06 +03:00
c9efdd20f4 Web: Files: added double click support for table view 2021-10-18 10:35:53 +03:00
351939b56e Fix bug 53150: folder duplicate by Enter 2021-10-16 15:39:32 +03:00
c7a4096c0d Web: Files: fix height selected tile 2021-10-16 15:32:45 +03:00
aafc615ade Web: Files: fix tile select on mobile 2021-10-16 15:25:14 +03:00
e46ee43ec0 Web: Files: Added check of downloadFiles response 2021-10-15 22:31:32 +03:00
b5157877d3 Web: Files: Removed viewUrl from bulkDownload params 2021-10-15 22:27:30 +03:00
16b78b94cd fixed bug 53106 2021-10-15 19:35:41 +03:00
7428893b2d Web: Common, Components, People: added small section prop for drop down 2021-10-15 18:29:32 +05:00
a45cef0981 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug52986 2021-10-15 16:12:11 +03:00
1b701b9bb9 Web: Files: delete useless 2021-10-15 16:12:00 +03:00
58fce28bf5 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-15 16:53:45 +05:00
26b06f778e Web: People: fixed language selection drop down 2021-10-15 16:52:49 +05:00
de0d04d8b9 Web: Files: added iconUrl to restore and empty recycle bin operations 2021-10-15 14:35:06 +03:00
732f08a80c Web: Files: added closing drop down when we scrolling 2021-10-15 16:32:41 +05:00
f06c435c6c Fix Bug 53105: close delete dialog on press enter 2021-10-15 13:15:55 +03:00
c198e0e4ff Web: Files: added a close condition when we want to copy the folder to the same place where it is 2021-10-15 13:15:03 +05:00
ff97e3134f Web: Components: added new icons, created GroupMenuItem component 2021-10-14 18:18:08 +03:00
845f906028 Fix bug 53150: folder duplicate by Enter 2021-10-14 14:56:48 +03:00
bc37fcc8ce Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-14 16:06:55 +05:00
e3718c3697 Merge branch 'release/1.0.0' into table-group-menu
# Conflicts:
#	packages/asc-web-components/table-container/StyledTableContainer.js
2021-10-14 13:46:11 +03:00
6f25c3f668 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-14 13:10:03 +03:00
5005e0a6c0 Web: Icons: Fixed old checkbox icons, change header plus icon 2021-10-14 13:09:54 +03:00
3603b9d899 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-14 11:56:09 +03:00
eb48347dcf Fixed Bug 53113 - Docs: You don't have enough permission to view/move the file 2021-10-14 11:56:02 +03:00
ddf8b26d6f Fix Bug 53139: tile align 2021-10-14 11:49:24 +03:00
552744ca82 Fix bug 53118: tile selection 2021-10-13 17:17:07 +03:00
e36697c9df Web: Files: TableGroupMenu moved to header 2021-10-13 16:04:49 +03:00
e389c4f57b Fix bug 53107: upload row line height 2021-10-13 14:07:58 +03:00
8626a8ad8d Web: Files: show error when downloading 2021-10-13 13:20:46 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
6e4e3d69aa Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-12 20:26:45 +05:00
5ebf7509da Web: People: fixed drop down displaying in ContactField components 2021-10-12 20:25:32 +05:00
3bb46b6e16 Web: Files: Tiles: Fixed checkbox displaying logic at tile for folder 2021-10-12 16:00:58 +03:00
42fdb1eb11 Web: Files: Tiles: Fixed icon element width for mobile devices 2021-10-12 15:55:09 +03:00
7bd30497a9 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-12 15:44:24 +03:00
9330ed07d0 Web: Files: Tiles: Restored icons to 32px, fixed container size 2021-10-12 15:44:16 +03:00
bb2cac21d7 Fix bug 51706: missing icons 2021-10-12 15:38:05 +03:00
e59b4eedf1 Web: Files: Added limitation on the visible length of the folder name of select file component. 2021-10-12 15:27:06 +03:00
076805b7a0 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-12 15:14:08 +03:00
e5509572b2 Fixed Bug 53073 - Client.Files.Editor. Added showing scroll after building folder tree. 2021-10-12 15:13:00 +03:00
79b7c37736 rename Postgre to PostgreSql 2021-10-12 13:25:04 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00