Commit Graph

7916 Commits

Author SHA1 Message Date
2f5a70e6ef analizators/s1940 2022-01-21 16:27:09 +03:00
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
893c4ddc5a Wen: Editor: Added a new parameter to the conversion api method. 2022-01-21 15:07:32 +03:00
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
cd12b41cc6 analizators/s1125 2022-01-21 14:01:52 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
eb9a33c660 analizators/s3218 2022-01-20 11:36:56 +03:00
3f28dfe78a analizators/s3237 2022-01-20 11:36:42 +03:00
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
25050cb5fd analizators/s2223 2022-01-19 17:16:15 +03:00
85f1660b39 analizators/U2U1203 2022-01-19 13:46:21 +03:00
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
f1f7a82b39 analizators/U2U1208 2022-01-18 17:00:48 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +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
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
516cd2fd80 analizators/U2U1111 2022-01-14 16:44:02 +03:00
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +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
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +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
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +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
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +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
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
Dmitry Kulak
84b1a18137 Web: Studio: Fixed header not closing on item click 2021-12-29 10:41:10 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +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
eb02c96697 microsoft recomended store the System.Guid type as string type in protobuf format 2021-12-23 18:29:35 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +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
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
156fbada6d edit translations bg 2021-12-16 17:13:44 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
9736c9ded8 Web: Socket: added redis, fixed editorCreateCopy 2021-12-16 15:28:01 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
e09f079052 Web: Editor: Fixed checking key`s existing inside config 2021-12-15 15:40:37 +03:00
0244c3b924 Web: Editor: Restored config as param 2021-12-15 15:07:25 +03:00
bb31f7d574 Web: Files: refactoring socket code 2021-12-15 12:32:38 +03:00
gectokot
f2548e27ba Web: Studio: Moved settings menu link from hamburger menu to profile menu 2021-12-14 14:47:23 +03:00
gectokot
e9449b5a72 Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode 2021-12-14 14:45:40 +03:00
gectokot
a1f0c01558 Web: Studio: Homepage: Fixed layout jump on load 2021-12-14 14:42:40 +03:00
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
gectokot
1ea64c8701 Web: Studio: Homepage: Now displayName is used in greeting message 2021-12-14 11:14:08 +03:00
6422c65841 Web: Files: moved openDocEditor to FilesActionsStore.js. Removed socket.js, added SocketStore 2021-12-13 18:42:53 +03:00
gectokot
8ee3ef5bd5 Web: Studio: Homepage: Changed logic for greeting message 2021-12-13 16:12:52 +03:00
gectokot
6f49b68f8e Web: Studio: Homepage: Fixes 2021-12-13 15:31:23 +03:00
gectokot
0a53e3bd7d Web: Studio: Homepage: Refactoring 2021-12-13 14:50:33 +03:00
031af716e6 Tfa: fix 2021-12-10 21:25:03 +03:00
gectokot
464a5cd456 Web: Studio: Fixed links 2021-12-10 20:06:03 +03:00
gectokot
cf5723cd53 Web: Studio: Renamed function isModuleOld to checkIfModuleOld 2021-12-10 17:31:46 +03:00
gectokot
d32dc40034 Web: Studio: Fixes, refactoring 2021-12-10 17:22:03 +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
gectokot
729e695dbc Web: Studio: Moved external link icon from utils to components 2021-12-10 16:16:10 +03:00
gectokot
4e38480b73 Web: Studio: Homepage: Removed hamburger menu 2021-12-10 13:10:36 +03:00
gectokot
85c55cd1ea Web: Studio: Homepage: Redesign 2021-12-10 12:24:35 +03:00
gectokot
49061c8e84 Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration 2021-12-10 10:26:13 +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
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
gectokot
eecdc3e0b1 Web: Studio: Refactoring 2021-12-09 18:59:52 +03:00
ca7a0f7cb7 WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab. 2021-12-09 16:16:43 +03:00