Commit Graph

6891 Commits

Author SHA1 Message Date
ac157df98d Web: Files: The converted file does not appear in the sorted folders. 2022-01-11 11:17:06 +03:00
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +03:00
efffe7feb3 Fixed Bug 54482 - People. User profile is not removed from the context menu 2022-01-10 10:55:29 +03:00
f2134c7600 Web: Files: Fixed last page operations after merge. 2021-12-30 12:55:49 +03:00
98f12cc15f DocStore: resolve conflict (febf172875) 2021-12-28 18:20:59 +03:00
4c5ba66857 Web: People: fixed table cell styles 2021-12-28 16:47:57 +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
829fba71a8 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-27 16:24:54 +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
57d1d50f57 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-23 14:02:16 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +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
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
15f412e1a8 Web:Files:Tests: update codecept config 2021-12-21 18:24:28 +08: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
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
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
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
466f46958d edit translations 2021-12-08 15:42:22 +03:00
36fa4131cc fix Bug 53137: save lastModified when uploading file 2021-12-08 15:36:24 +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
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
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