Commit Graph

7097 Commits

Author SHA1 Message Date
bd410ebcd8 Web:Files:Badges:Combining shared and version status into one badge. Сolor change active SharedButton. 2021-12-10 18:46:41 +03:00
a62a555217 Files: tagDao. Precompiled queries 2021-12-10 17:04:33 +03:00
30c138ef8b Files: optimization configuration 2021-12-10 17:02:44 +03:00
055c200b60 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-10 16:31:29 +03:00
1d2750f23b Web: Files: Remove privacy folders from select files/folders dialog. 2021-12-10 16:30:20 +03:00
fce12af277 add translations 2021-12-10 13:34:21 +03:00
6e6a12fc95 Merge branch 'release/v1.1.0' into feature/editor-history 2021-12-10 10:00:15 +03:00
c3e440ee9c Web: Files: Added reset of fields after creating a template from the current file. 2021-12-10 09:58:04 +03:00
00ab71280c Merge branch 'release/v1.1.0' into feature/editor-history 2021-12-10 09:36:12 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
02a57ac53e Web: People: Added dropDownMaxHeight 2021-12-09 19:48:03 +03:00
afe25e3bc4 Fix issues of WrongTranslationVariablesTest 2021-12-09 19:47:18 +03:00
f5c5d1fa78 Web:Files:Badges:Added badgesComponent and HOC withBadges in FilesRowContent. Added quickButtonsComponent and HOC withQuickButtons in SimpleFilesRow. 2021-12-09 17:35:54 +03:00
05a551d2b1 Web:Files:Badges:Added new component QuickButtons and HOC WithQuickButtons. Moved badges from the Badges component to QuickButtons. Moved actions badges from HOC withBadges to WithQuickButtons. 2021-12-09 16:31:13 +03:00
5a8c60edf8 edit vi 2021-12-09 14:27:19 +03:00
372ba52d94 add translations 2021-12-09 14:07:51 +03:00
e8af856c26 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-09 13:55:55 +03:00
7c15232f71 Web: Locales: Changed translation "New master form" to "New form template" 2021-12-09 13:54:56 +03:00
86cd5e21e9 Server: Files: Configuration: Added ImageDark property for editors config, if we open filling form in dark mode 2021-12-09 13:39:03 +03:00
41681d0c94 Server: Files: Configuration: Fixed logo type for filling form mode 2021-12-09 12:45:52 +03:00
b82747e7f4 Web:Files:Badges:Fixed work cursor lock badge. 2021-12-08 19:20:40 +03:00
87fe0892a4 Web:Files:Badges:Returned the frame on hover badge version. 2021-12-08 18:56:15 +03:00
1b289515be Files: rename master form to form template 2021-12-08 17:00:04 +03:00
73527a51dc add translations 2021-12-08 15:58:10 +03:00
ac5edf13cb Web:Files:Badges:Edited badges styles. 2021-12-08 15:43:12 +03:00
466f46958d edit translations 2021-12-08 15:42:22 +03:00
feb48c01a0 Files: moved from feature/editor-version-history 2021-12-08 15:25:39 +03:00
225f277976 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-08 15:24:13 +03:00
4009717f96 edit lo 2021-12-08 15:23:44 +03:00
674732ee60 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-08 15:22:53 +03:00
898101485b edit lo 2021-12-08 15:22:06 +03:00
489ecb1b26 add translations 2021-12-08 15:18:22 +03:00
b0dc82210a Fixed Bug 54407 - Client.Files.FormTemplate. Added folder filtering excluding subfolders. 2021-12-08 14:49:54 +03:00
f1bebda4aa Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-08 14:20:51 +03:00
458284c5fc Web: Files: SelectFileDialog/SelectFolderDialog: Added shift of all folders to the left if there are no subfolders. 2021-12-08 14:20:40 +03:00
614ee07ee6 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-08 13:48:28 +03:00
eba68c62dc Web: Files: Added rename form file after creating from template. Fixed temp editing file parameters. Fixed create form from dialog, now it use action 2021-12-08 13:48:19 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
a0335532fc Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-08 13:12:08 +03:00
2766859431 Web: Files: fixed upload panel header styles 2021-12-08 13:12:01 +03:00
89adb75360 Fix Bug 54383 - Client.Files: ‘Somehing went wrong’ on converting password protected file 2021-12-08 12:30:03 +03:00
de3dbc78e9 add translations 2021-12-08 12:24:19 +03:00
ddbaee09e4 add translations 2021-12-08 12:23:52 +03:00
300a45a172 add translations 2021-12-08 12:23:12 +03:00
bc95ce2356 add translations 2021-12-08 12:21:49 +03:00
430a775a89 add translations 2021-12-08 12:20:57 +03:00
ee830562ec add translations 2021-12-08 12:20:21 +03:00
6abb579669 edit pt 2021-12-08 11:08:22 +03:00
8eb1ea7c3b Web:Files:Badges: Added edit icons to appserver /public /images. Changed the display of edit icons. 2021-12-07 20:13:57 +03:00
d48aa7ea64 Web: Files: SelectFileDialog: fixed prop types. 2021-12-07 18:07:35 +03:00
e2899e57e4 add translations 2021-12-07 17:17:56 +03:00
ed25eff441 add ru 2021-12-07 17:13:24 +03:00
879548ab7f add pt_BR 2021-12-07 17:13:02 +03:00
dba7e2afd6 edit lo 2021-12-07 16:59:36 +03:00
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
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
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
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
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
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
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
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
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
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
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
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +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
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
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