|
|
b7d6454dbe
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-14 14:39:31 +03:00 |
|
|
|
74d6b4bfd6
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-08 16:06:34 +03:00 |
|
|
|
8d6818c6cd
|
Web: Client: fixed header-logo-wrapper styles
|
2022-02-08 16:06:25 +03:00 |
|
|
|
f879125045
|
Web: Client: added checkMaintenance when firebase helper not enable
|
2022-02-08 14:56:34 +05:00 |
|
|
|
33c0e49705
|
add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel
|
2022-02-07 16:44:59 +03:00 |
|
|
|
3a16fdccfd
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-03 21:05:07 +03:00 |
|
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
|
|
0f76ba3613
|
Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites.
|
2022-02-03 17:49:00 +03:00 |
|
|
|
d0bb0c18a6
|
Web: Files: Fixed editing of converted file.
|
2022-02-02 19:32:38 +03:00 |
|
|
|
6750931fe9
|
Web: Files: Added error handler for request edit rights function.
|
2022-02-02 18:29:00 +03:00 |
|
|
|
76eead7708
|
Web: Files: Fixed editing of shared form.
|
2022-02-02 18:16:52 +03:00 |
|
|
|
94d51d88b5
|
Web: ASC.Web.Campaigns: added gatsby project
|
2022-02-01 20:03:37 +05:00 |
|
|
|
01fdb34aaa
|
Web: ACS.Web.Campaigns: delete submodule
|
2022-02-01 19:18:23 +05:00 |
|
|
|
94b364efcb
|
Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner
|
2022-02-01 13:33:27 +05:00 |
|
|
|
6102fce721
|
Web: ASC.Web.Campaigns:added project for creating banner templates
|
2022-02-01 13:30:32 +05:00 |
|
|
|
f6b374226f
|
Web: Client: added skip maintenance param, added onLoad func for bar config
|
2022-02-01 12:51:49 +05:00 |
|
|
|
a40e8bf755
|
Web: Client: deleted checkedMaintenance
|
2022-02-01 12:49:38 +05:00 |
|
|
|
47d43fbcfb
|
WebL Editor: Removed commented code
|
2022-01-31 15:16:31 +03:00 |
|
|
|
dbafbc738c
|
Web: Client: fixed the navbar positioning
|
2022-01-27 17:45:01 +05:00 |
|
|
|
5f843a1d5d
|
Web: Client: added checked and exist params for maintenance banner
|
2022-01-27 17:19:03 +05:00 |
|
|
|
988e822a80
|
Web: Client: changed positioning when there is a banner on the page
|
2022-01-27 17:16:47 +05:00 |
|
|
|
5169d60783
|
Web: Client: added checkedMaintenance
|
2022-01-25 20:10:54 +05:00 |
|
|
|
eb75b0b32a
|
Web: Files: Added opportunity to react on modify-folder with socket
|
2022-01-24 20:43:24 +03:00 |
|
|
|
1f61f4bd4c
|
Web: Client: created checkBar function
|
2022-01-24 18:49:23 +05:00 |
|
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
|
|
a66964e0b8
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-01-21 18:46:20 +03:00 |
|
|
|
f7689fefe6
|
Web: add campaigns folder
|
2022-01-21 18:32:33 +03:00 |
|
|
|
893c4ddc5a
|
Wen: Editor: Added a new parameter to the conversion api method.
|
2022-01-21 15:07:32 +03:00 |
|
|
|
17a06e66f2
|
Web: Client: get banners every 12h
|
2022-01-19 13:23:29 +03:00 |
|
|
|
21f3c390bb
|
Web: Studio: fixed file name
|
2022-01-18 14:45:45 +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 |
|
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
|
|
6f90864ed8
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-13 10:49:43 +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 |
|
|
|
aba8cb9174
|
Web: Studio: fixed logo styles
|
2022-01-12 16:11:14 +03:00 |
|
|
|
2ffa9eb180
|
Web: Studio: added icons to header for desktop view
|
2022-01-12 15:53:52 +03:00 |
|
Dmitry Kulak
|
de8fdb748d
|
Web: Studio: Header: Fixed spacing between burger menu button and logo
|
2022-01-11 14:37:11 +03:00 |
|
Dmitry Kulak
|
38e09fe63a
|
Web: Studio: Header: Fixed margin for logo on Personal
|
2022-01-10 19:17:23 +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 |
|
Dmitry Kulak
|
84b1a18137
|
Web: Studio: Fixed header not closing on item click
|
2021-12-29 10:41:10 +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 |
|
|
|
c78cd078cf
|
Merge pull request #481 from ONLYOFFICE/feature/redesign-start-page
Feature/redesign start page
|
2021-12-27 17:33:48 +03:00 |
|
|
|
657961c334
|
Web: Socket: Implemented "stop editing" + refactoring
|
2021-12-24 20:58:38 +03:00 |
|
|
|
440811e931
|
Web: Added convertLanguage for compatibility
|
2021-12-23 14:01:08 +03:00 |
|
|
|
3bf412166d
|
Web: Settings: Commented old redux actions
|
2021-12-23 13:09:38 +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 |
|
|
|
9e24c182c9
|
edit ko
|
2021-12-23 11:22:48 +03:00 |
|
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
|
|
1d49c9dc51
|
Web: Client: Fixed spelling errors
|
2021-12-21 20:25:59 +03:00 |
|
