|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
33026385e2
|
Web: Tests: Added new excludes to spellcheck-excludes.json
|
2021-12-23 11:36:59 +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 |
|
|
|
ab931e40ef
|
edit bg, az
|
2021-12-23 11:23:25 +03:00 |
|
|
|
9e24c182c9
|
edit ko
|
2021-12-23 11:22:48 +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 |
|
|
|
a785eb2692
|
Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues
|
2021-12-22 18:17:22 +03: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 |
|
|
|
4688fcce41
|
Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-22 18:48:41 +08: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 |
|
