Commit Graph

3794 Commits

Author SHA1 Message Date
3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-12-30 14:34:49 +03:00
f2134c7600 Web: Files: Fixed last page operations after merge. 2021-12-30 12:55:49 +03:00
ddead9c17f WEb: Files: Refactoring. 2021-12-29 17:28:32 +03:00
c9e7503e35 Web: Files: Changed password input logic. 2021-12-29 16:00:03 +03:00
a6a5140fec Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2021-12-28 16:04:51 +03:00
f282d23a59 Web: Files: fixed NewFilesPanel styles 2021-12-28 16:04:40 +03:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	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/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
3b42a6e0db Web: files: deleted useless code. 2021-12-28 11:41:10 +03:00
5e0747e8b5 Web: Files: Added folder for sub components. 2021-12-28 11:35:41 +03:00
3dd22c418c Web: Files: Refactoring. 2021-12-28 11:24:54 +03:00
fdf6f0a2d2 Web: Files: Added translations. 2021-12-28 08:57:56 +03:00
c5c4705c64 Web: Files: Renaming. 2021-12-27 19:18:15 +03:00
e7aff4a118 Web: Files: Added simulate password for convert file. 2021-12-27 19:12:55 +03:00
829fba71a8 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-27 16:24:54 +03:00
79b7fee7e5 Web: Files: Fixed style. 2021-12-23 17:51:30 +03:00
c02624c907 WEb: Files: Refactoring. 2021-12-23 17:48:20 +03:00
0484bd547c Web: Files: Fixed file name according layouts. 2021-12-23 17:45:14 +03:00
3423696d23 Web: Files: Fixed translation. 2021-12-23 17:42:06 +03:00
dc7b2675f3 Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders 2021-12-23 16:29:21 +03:00
4c72f35766 Web: Files: Fixed styles for iOS. 2021-12-23 16:12:41 +03:00
331bc95fa9 Web: Files: Redesign of upload panel. 2021-12-23 14:53:32 +03:00
57d1d50f57 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-23 14:02:16 +03:00
757bee9f28 Web: Files: Renaming. 2021-12-23 12:19:39 +03:00
604354f494 Web: Files: Changed title for actions. 2021-12-23 12:17:39 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
858e5084c0 WEb: Files: Refactoring. 2021-12-22 16:07:26 +03:00
55cb04d4ad Web: Files: Added adaptive layout. 2021-12-22 15:37:13 +03:00
35cac885f3 Web: Files: UploadPanel: Added error handler for password input. 2021-12-22 13:59:19 +03:00
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
332aec8c28 Web: Files: Added translations. 2021-12-22 13:41:34 +03:00
76d423aa31 Web: files: Fixed styles. 2021-12-22 13:22:25 +03:00
c9f1765575 Web: Files: Added the ability to enter a password and convert. 2021-12-22 12:22:23 +03:00
5a6147bd36 Web: Files: Added logic for converting with password. 2021-12-22 12:21:03 +03:00
6ae2438395 Web: Files: UploadPanel: Added hide input prop. 2021-12-22 12:17:47 +03:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
47681bb6f1 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2021-12-21 14:48:05 +03:00
15f412e1a8 Web:Files:Tests: update codecept config 2021-12-21 18:24:28 +08:00
99ac48051d Web: files: Added password input component. 2021-12-21 12:05:14 +03:00
0fc88adaa5 Web: files: Fixed styles according layouts. 2021-12-21 12:03:01 +03:00
6295dc8bd5 Web: Files: Actions of uploaded files has been moved to a separate file. 2021-12-21 12:01:12 +03:00
43b1c181f0 WEb: Files: refactoring. 2021-12-21 11:55:55 +03:00
1168fafb48 Web: Files: The displayed error has been moved to a separate file. 2021-12-21 11:49:18 +03:00
c3afe77716 Web: Files: Components rewritten, added button to show input. 2021-12-21 11:29:19 +03:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
656fa2df89 edit translations 2021-12-17 10:14:40 +03:00
a62fe009df edit vi 2021-12-16 15:30:20 +03:00
37ee77d7d0 Fixed Bug 52887 - Web:Files:SelectFileDialog: The picture is replaced through the context menu in the editor. 2021-12-16 09:00:11 +03:00
780df07ae3 Web: Files: EmptyContainer: Added create form template button at empty root folder screen 2021-12-15 23:19:49 +03:00
28bc76b396 Web: Files: Delete translation key CreateWithEmptyTitle 2021-12-15 23:03:28 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
f0f5246dad Web: Files: Delete translation key CreateWithEmptyTitle 2021-12-15 17:02:42 +03:00
8e6d87b9c8 Web: Files: HOC: Fixed bug, empty file / folder name field cancels its creation 2021-12-15 17:02:01 +03:00
daec1f5294 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-15 13:32:21 +03:00
8e97763dd9 edit Home.json 2021-12-14 13:31:16 +03:00
Maria-Sukhova
2ecc3b01ea
Update Home.json 2021-12-14 13:24:33 +03:00
49f3955e07 edit translations 2021-12-14 13:17:23 +03:00
4eee5b49a2 add lo 2021-12-13 14:55:33 +03:00
65a7ae3df4 add translations el 2021-12-13 12:26:37 +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
c3e440ee9c Web: Files: Added reset of fields after creating a template from the current file. 2021-12-10 09:58:04 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +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
73527a51dc add translations 2021-12-08 15:58:10 +03:00
466f46958d edit translations 2021-12-08 15:42:22 +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
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
bc95ce2356 add translations 2021-12-08 12:21:49 +03:00
6abb579669 edit pt 2021-12-08 11:08:22 +03:00
d48aa7ea64 Web: Files: SelectFileDialog: fixed prop types. 2021-12-07 18:07:35 +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
ebbe069621 edit tr 2021-12-07 16:59:01 +03:00
d12365b6fd edit pt 2021-12-07 16:58:39 +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
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
c3c06e15fb edit files 2021-12-07 12:33:51 +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
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
8fd682ef5c edit translations 2021-12-06 13:04:09 +03:00
086cc8efd2 Web: Fixed format of searchParam for files selector 2021-12-03 18:41:57 +03:00
98a4ad4db0 Web: Files: Store: Removed file id encoding for creating form from file 2021-12-03 18:00:28 +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
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
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
e75031c7b8 Web: Files: Translations: Changed translations for form actions 2021-12-02 13:00:13 +03:00
066ae39f5e add az 2021-12-02 12:48:07 +03: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
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
f24a2c690e Web: Files: Download dialog: fixed dialog styles 2021-12-01 12:42:01 +03:00
d7f12761f9 Web: Files: Download dialog: fixed filename width 2021-12-01 12:25:16 +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
ac5cf8301f Web: Files: fixed SelectFileDialog tree-folders styles 2021-11-30 17:43:16 +03:00
5b0536d7d8 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 14:22:41 +03:00
27af300dd5 Web: Files: fixed EncryptedFileIcon styles 2021-11-30 12:07:51 +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