Commit Graph

15831 Commits

Author SHA1 Message Date
15f15da4a0 Web: files: Added translations. 2022-01-11 15:46:53 +03:00
Dmitry Kulak
de8fdb748d Web: Studio: Header: Fixed spacing between burger menu button and logo 2022-01-11 14:37:11 +03:00
0246f10380 Web: People: fixed mobx warning 2022-01-11 12:35:53 +03:00
2fdb1fa746 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-11 12:35:01 +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
Dmitry Kulak
38e09fe63a Web: Studio: Header: Fixed margin for logo on Personal 2022-01-10 19:17:23 +03:00
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
c7bb1a51d5 Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card 2022-01-10 16:24:21 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +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
efffe7feb3 Fixed Bug 54482 - People. User profile is not removed from the context menu 2022-01-10 10:55:29 +03:00
5c97e7ed63 Web: Socket.IO: Changed logger settings 2021-12-30 15:55:00 +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
Dmitry Kulak
84b1a18137 Web: Studio: Fixed header not closing on item click 2021-12-29 10:41:10 +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
605e7eba35 Fix bad merge febf172875 2021-12-28 14:56:00 +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
14783ee105
Merge pull request #485 from ONLYOFFICE/release/v1.1.0
Release/v1.1.0
2021-12-27 20:39:18 +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
c78cd078cf
Merge pull request #481 from ONLYOFFICE/feature/redesign-start-page
Feature/redesign start page
2021-12-27 17:33:48 +03:00
829fba71a8 Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon 2021-12-27 16:24:54 +03:00
657961c334 Web: Socket: Implemented "stop editing" + refactoring 2021-12-24 20:58:38 +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
dc3c7b5e30 Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported 2021-12-23 16:48: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
4c72f35766 Web: Files: Fixed styles for iOS. 2021-12-23 16:12:41 +03:00
2ff6a871a3
Merge pull request #484 from ONLYOFFICE/feature/translate-1.1.0
Feature/translate 1.1.0
2021-12-23 15:52:21 +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
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
31f03a430b Config: Restored old languages 2021-12-23 14:00:08 +03:00
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +03:00
3bf412166d Web: Settings: Commented old redux actions 2021-12-23 13:09:38 +03:00