Commit Graph

3869 Commits

Author SHA1 Message Date
efe799d712 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/helpers/utils.js
2022-01-21 14:44:06 +03:00
8de8ffbb86 Web: Files: Deleted useless code. 2022-01-21 14:40:13 +03:00
e3497f0ad1 Web: Files: Added header translation. 2022-01-21 14:14:17 +03:00
e1d07c5699 Web: Files: Added English translation. 2022-01-21 13:45:52 +03:00
97624451a8 Web: Files: Fixed Regular expression. 2022-01-21 11:24:54 +03:00
f7779b3056 Web: Files: refactoring. 2022-01-21 10:51:01 +03:00
720ca53c70 Web: Files: Added password error handler to HOCs. 2022-01-21 10:49:52 +03:00
1e5877faef Web: Files: Added row loader when creation file or folder. 2022-01-21 10:38:34 +03:00
d4b28b7de3 Fixed Bug 53524 - VersionHistory: User's display name with diacritics invalid 2022-01-20 11:43:16 +03:00
4cbb25048f Web: Files: Added password error handler. 2022-01-20 11:09:40 +03:00
68f2952975 Web: Files: Added loader for button. 2022-01-19 17:09:08 +03:00
3ac17188cb Fixed Bug 54083 - Client.Files. Fixed file selection reset 2022-01-19 17:07:33 +03:00
c3687bc804 Web: Files: Added warning about creating a file with an error. 2022-01-19 17:04:58 +03:00
384a3b1129 Web: files: Added dialog description. 2022-01-19 16:56:40 +03:00
fd5b61dce1 Web: Files: Added warning about successful file creation. 2022-01-19 15:56:37 +03:00
53eee989e6 Web: Files: Added warning toastr about file protecting. 2022-01-19 15:28:53 +03:00
fde1f1c015 Web:Files:Сhanged history.pushState method to history.push. 2022-01-19 12:27:17 +03:00
832b422007 Web: Files: Added logic for entering a password when creating a form template from a text file. 2022-01-19 10:24:07 +03:00
0a90636703 Web: Files: When confirming the creation of a file, the buttons were removed. Added password entry process. 2022-01-18 18:35:13 +03:00
aea69a3077 Fixed Bug 54884 - Client.Files. Removed the possibility of simultaneous operations with files. 2022-01-18 18:08:27 +03:00
1271bae470 Web: Files: Added copy api method to create form template, added closing editors tab. 2022-01-18 12:22:55 +03:00
28bbc72ad5 Web:Files:Added history.pushState method to display images in HOC withFileActions. 2022-01-18 10:46:02 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
474f754dd9 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-17 17:20:35 +03:00
9e49ae6a75 Web: Files: Refactoring, removed bug with memory leak. 2022-01-17 16:21:10 +03:00
87fa4afcd3 Web: Files: Refactoring. 2022-01-17 15:57:37 +03:00
aa8903b0ef Web: Files: Added copy method to save in 'oform' format. 2022-01-17 15:54:14 +03:00
a853d511e5 Web: Files: Added new prop. 2022-01-17 15:50:42 +03:00
753e8c48bd Fixed Bug 54881 - Client.Files. Disabled "Move to Trash" button when no item is selected 2022-01-17 15:35:20 +03:00
83c952bf7e Web: Files: removed recent request for private folder 2022-01-17 11:40:35 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
783bdd27f0 WEb: Files: Change the password dialog due to modification of the password imitation component. 2022-01-14 14:36:14 +03:00
e6647c835f Web: Files: Simplification of the password imitating component. 2022-01-14 12:17:59 +03:00
bed51de56e Web: Files: Refactoring. 2022-01-13 16:21:08 +03:00
4cec0e7828 Fixed Bug 54870 - Client.Files.Clouds.Drag’n’drop. Fixed drag'n'drop movement third-party storage folders. 2022-01-13 15:37:19 +03:00
9a236cabf5 Web: Files: Added possibility to change width of password input. 2022-01-13 15:36:40 +03:00
23c8a8358e Web: Files: Added password dialog. 2022-01-13 15:35:56 +03:00
6fd00f52c5 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2022-01-13 13:14:03 +03:00
e6f89afb6d Web: Files: Transferring actions to a row file. 2022-01-13 12:53:30 +03:00
1681507100 Fixed Bug 54580 - Docs. Private Rooms. Unable to load form file '.oform' 2022-01-13 12:13:48 +03:00
94a4ddb146 Web: files: Fixed import. 2022-01-13 11:40:46 +03:00
d8ee3de51a Web: Files: Moving a component to a separate folder. 2022-01-13 11:37:24 +03:00
52c48a810c Web: files: Added error toastr. 2022-01-13 11:18:41 +03:00
6f90864ed8 Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-13 10:49:43 +03:00
dbb80ac38b Web: Files: Added new translation. 2022-01-13 10:13:54 +03:00
3a0684d24b Web: Files: Fixed translations for languages. 2022-01-13 10:03:53 +03:00
549c381ca1 Web: Files: Fixed translations for Italian language. 2022-01-13 09:59:50 +03:00
baeadfd93a Web: Files: fixed fr translations. 2022-01-13 09:56:52 +03:00
7e74cf8c91 Web: Files: fixed translations. 2022-01-13 09:55:05 +03:00
253ae7aa19 Web: Files: Renaming of translations keys. 2022-01-13 09:40:26 +03:00
c81fe84da2 Web: Files: Fixed translations. 2022-01-13 09:28:17 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
a91d767c66 Merge branch 'hotfix/v1.1.1' into bugfix/conversion-dialog-in-sorted-folders 2022-01-12 17:26:48 +03:00
332fc5866a Web: Files: Hide the file destination when checkbox is not set. 2022-01-12 17:09:21 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +03:00
d2fb921a7c Web:Files: Refactoring. 2022-01-11 18:59:35 +03:00
1941ceee28 Web: Files: Added toast for success conversion. 2022-01-11 18:48:09 +03:00
6ba659ac04 Web: Files: Added translations. 2022-01-11 18:43:43 +03:00
8b9ea275de Web: Files: Renaming. 2022-01-11 17:08:42 +03:00
a87a1a22b5 Web: Files: Added information about file destination. 2022-01-11 17:05:36 +03:00
0c341f0709 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2022-01-11 16:14:46 +03:00
15f15da4a0 Web: files: Added translations. 2022-01-11 15:46:53 +03:00
3565666fd2 Web: Table: fixed default columns size, fixed styles 2022-01-11 12:34:54 +03:00
ac157df98d Web: Files: The converted file does not appear in the sorted folders. 2022-01-11 11:17:06 +03:00
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
f8035967b5 Web: Socket: Changed room settings 2021-12-30 15:54:23 +03:00
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
d25076eb02 Web: Files: fixed VersionHistoryStore error 2021-12-24 16:13:31 +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
dba445fbb2 Fixed Bug 53171 - Client.Files.Editor. Removed restore revision option if the file is open for editing. 2021-12-21 17:23:23 +03:00
47681bb6f1 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2021-12-21 14:48:05 +03:00
aca7239f62 Fixed Bug 51909 - Client.Files. Disabled the Move/Delete options for a file open for editing 2021-12-21 13:32:28 +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
99e37d960d Web: Socket.IO: Refactoring work with socket.io 2021-12-20 15:38:08 +03:00
656fa2df89 edit translations 2021-12-17 10:14:40 +03:00
a62fe009df edit vi 2021-12-16 15:30:20 +03:00
9736c9ded8 Web: Socket: added redis, fixed editorCreateCopy 2021-12-16 15:28:01 +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
bb31f7d574 Web: Files: refactoring socket code 2021-12-15 12:32:38 +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
6422c65841 Web: Files: moved openDocEditor to FilesActionsStore.js. Removed socket.js, added SocketStore 2021-12-13 18:42:53 +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
d230a40e8e Web: Socket: fixed cookies 2021-12-10 14:20:51 +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
ed41326acc Web: socket-io, first version 2021-12-09 15:50:50 +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