Commit Graph

8073 Commits

Author SHA1 Message Date
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
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +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
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +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
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +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
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
156fbada6d edit translations bg 2021-12-16 17:13:44 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +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
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
031af716e6 Tfa: fix 2021-12-10 21:25: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
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
e8af856c26 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-09 13:55:55 +03:00
41681d0c94 Server: Files: Configuration: Fixed logo type for filling form mode 2021-12-09 12:45:52 +03:00
3921fa74f3 Web: Editor: Deleted useless imports. 2021-12-08 17:00:24 +03:00
c41937002f Web: Editor: Added a condition for showing the history restore function. 2021-12-08 16:52:50 +03:00
e771000f8a Web: Editor: Deleted useless code. 2021-12-08 16:46:09 +03:00
3b17a90b1b Web: Editor: Fixed after cherry picking. 2021-12-08 16:45:12 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
aeb5121331 Web: Editor: Fixed displaying info. 2021-12-08 16:28:30 +03:00
3937082fc9 Web: Editor: Fixed object parameters of history data. 2021-12-08 16:28:30 +03:00
17129ad9d1 Erb: Editor: Renaming. 2021-12-08 16:28:30 +03:00
a3c4577482 Web: Editor: Refactoring. 2021-12-08 16:28:29 +03:00
1983d60e55 Web: Editor: Moved the functionality of converting history and getting the current version into separate functions. 2021-12-08 16:28:29 +03:00
944591cd4d Web: Editor: Added error handler for history function. 2021-12-08 16:28:29 +03:00
71aa1eb474 Web: Editor: Added restore option. 2021-12-08 16:28:29 +03:00
30bd96a4c6 Web: Editor: Fixed opening of revisions. 2021-12-08 16:28:28 +03:00
bc8a7f3dd2 Web: Editor: Removed revisions from versions list. 2021-12-08 16:28:28 +03:00
70cc67b356 Web: Editor: Refactoring. 2021-12-08 16:28:28 +03:00
d20f833889 Web: Editor: Renaming. 2021-12-08 16:28:28 +03:00
d5b2b2a395 Web: Editor: Added error handler for history data. 2021-12-08 16:28:28 +03:00
a79db0fa25 Web: Editor: Added version to the history data. 2021-12-08 16:28:27 +03:00
fcb4e43d55 Web: Editor: Removed side effect - changes of array length. 2021-12-08 16:28:27 +03:00
a6deb7febb Web: Editor: Fixed display of editing date. 2021-12-08 16:28:27 +03:00
7fd1452e81 Web: Editor: Fixed current version of document. 2021-12-08 16:28:27 +03:00
c6265a9cb4 Web: Editor: Fixed getting name and id of user for history. 2021-12-08 16:28:26 +03:00
5fa436eb21 Web: Editor: Fixed getting information of difference of file. 2021-12-08 16:28:26 +03:00
e3eb043c2a Web: Editor: Added new api method for RequestHistory method. 2021-12-08 16:28:26 +03:00
674732ee60 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-08 15:22:53 +03:00
8441a506af add translations 2021-12-08 15:17:26 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
2187cb5331 edit lv 2021-12-08 12:24:54 +03:00
475dd92c30 Web: Editor: Fixed history information. 2021-12-08 09:37:40 +03:00
6d96855e79 Web: Editor: Added list of history and possibility to close history.
# Conflicts:
#	web/ASC.Web.Editor/src/Editor.jsx
2021-12-08 09:37:02 +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
f9c92a6bd7 edit pt_PT 2021-12-07 12:40:49 +03:00
3607a54cd2 edit vi 2021-12-07 10:38:03 +03:00
7973639195 edit vi 2021-12-07 10:37:30 +03:00
ee935ec401 edit az 2021-12-06 18:21:35 +03:00