|
|
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 |
|
|
|
f8bdd48db8
|
add pt_PT
|
2021-12-06 18:21:13 +03:00 |
|
|
|
6ef7c23bac
|
add pt_PT
|
2021-12-06 18:20:48 +03:00 |
|
|
|
0952d01250
|
add uk
|
2021-12-06 17:29:41 +03:00 |
|
|
|
9126ea393d
|
add uk
|
2021-12-06 17:29:19 +03:00 |
|
|
|
40c5a0d6b2
|
add az
|
2021-12-06 17:11:54 +03:00 |
|
|
|
4fef520aba
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-06 15:09:57 +03:00 |
|
|
|
d0a4cee8ef
|
edit translations
|
2021-12-06 13:05:56 +03:00 |
|
|
|
a059fc9b7c
|
edit translations
|
2021-12-06 13:05:31 +03:00 |
|
|
|
af2e95dfd7
|
edit cs
|
2021-12-06 11:28:11 +03:00 |
|
|
|
086cc8efd2
|
Web: Fixed format of searchParam for files selector
|
2021-12-03 18:41:57 +03:00 |
|
|
|
edff6e2f40
|
update pl
|
2021-12-01 18:32:54 +03:00 |
|
|
|
bc58174a89
|
update pl
|
2021-12-01 18:13:16 +03:00 |
|
|
|
e1b0164bd3
|
update cs
|
2021-12-01 18:04:36 +03:00 |
|
|
|
00f2e1821e
|
edit cs
|
2021-12-01 18:03:54 +03:00 |
|
|
|
0ba91e0100
|
update cs
|
2021-12-01 17:54:46 +03:00 |
|
|
|
870f05fc83
|
add el
|
2021-12-01 17:42:50 +03:00 |
|
|
|
e4ee37660e
|
update el
|
2021-12-01 17:40:56 +03:00 |
|
|
|
50a4added2
|
update el
|
2021-12-01 17:40:27 +03:00 |
|
|
|
a17e301cde
|
update bg
|
2021-12-01 14:36:33 +03:00 |
|
|
|
7823b9804c
|
update bg
|
2021-12-01 14:36:04 +03:00 |
|
|
|
1ea835b0bf
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-01 12:05:51 +03:00 |
|
|
|
27e732e9a3
|
Web: Login: Added usage of new API /authentication.json parameter "session"
|
2021-12-01 10:56:50 +03:00 |
|
|
|
626191c5d7
|
Core: fixed session
|
2021-11-30 22:16:23 +03:00 |
|
|
|
39b10cf7b1
|
edit ro
|
2021-11-30 17:20:47 +03:00 |
|
|
|
d5d87a679f
|
update translations
|
2021-11-30 12:35:00 +03:00 |
|
|
|
77f86fccdb
|
update translations
|
2021-11-30 12:31:54 +03:00 |
|
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
|
a032b83a32
|
Web: Editor: Optimization - Removing unnecessary api requests.
|
2021-11-30 10:59:41 +03:00 |
|
|
|
43d04b28de
|
edit uk
|
2021-11-29 15:27:40 +03:00 |
|
|
|
5a5169b391
|
edit cz
|
2021-11-29 15:22:40 +03:00 |
|
|
|
bbe874054e
|
update translations
|
2021-11-29 12:37:32 +03:00 |
|
|
|
cecfc406c5
|
Auth: added session param
|
2021-11-26 21:59:39 +03:00 |
|
|
|
d297fa0dd1
|
fix Bug 52071
|
2021-11-26 21:36:51 +03:00 |
|
|
|
04a56e57cb
|
Web: Editor: Fixed bug with starting api calls before getting file id
|
2021-11-26 13:48:15 +03:00 |
|
|
|
18d0cd0842
|
Web: Shell: Fix minimization on production build static
|
2021-11-25 17:39:25 +03:00 |
|
|
|
384e012c5f
|
net 6: remove TryUseWindowsService
|
2021-11-25 16:48:08 +03:00 |
|
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
|
ff9bb93efd
|
Web: Scripts: Hide shx mkdir errors
|
2021-11-25 15:06:19 +03:00 |
|
|
|
58d84912dd
|
fix
|
2021-11-25 11:23:35 +03:00 |
|
|
|
038cf92a91
|
ApiSystemHelper: fix check
|
2021-11-25 11:00:17 +03:00 |
|
|
|
13e13f2303
|
Net: fix requests
|
2021-11-24 22:34:39 +03:00 |
|
|
|
b74e4ccfd1
|
Removed unused dependencies. Fixed tests
|
2021-11-24 12:39:39 +03:00 |
|
|
|
59c88e2006
|
up to 6.0.0
|
2021-11-23 17:56:27 +03:00 |
|
|
|
8ca88e4620
|
Merge branch 'develop' into feature/net6
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/ASC.Common.csproj
# products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
|
2021-11-23 16:40:50 +03:00 |
|
|
|
3417cb28f4
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-22 11:25:49 +03:00 |
|
|
|
b632f3a623
|
Web: Fixed styles according layouts, renaming.
|
2021-11-22 10:15:24 +03:00 |
|
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# 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/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
|
d31ea87211
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-11-21 13:57:55 +03:00 |
|
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
|
2eb6843e46
|
Web: Editor: Added conditions for creating a file in my documents folder when filling out a form.
|
2021-11-19 10:28:57 +03:00 |
|
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
|
|
2c6e0d45bc
|
Web: Fix wrong braces of variables inside translation files
|
2021-11-13 19:07:48 +03:00 |
|
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
|
623313e4be
|
Web: Restored missing 'ru' translations
|
2021-11-12 21:14:44 +03:00 |
|
|
|
5ff07a8293
|
Web: Fix UselessTranslationKeysTest translation issues
|
2021-11-12 20:46:04 +03:00 |
|
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
|
fc42416fea
|
fix config
|
2021-11-12 10:57:12 +03:00 |
|
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids
|
2021-11-11 15:37:23 +03:00 |
|
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
|
e917b4bb56
|
Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json
|
2021-11-10 15:52:36 +03:00 |
|
|
|
cd897aa8f1
|
Web: About: Fix DublicatesByContentTest translation issue
|
2021-11-08 15:33:27 +03:00 |
|
|
|
baccb134a6
|
Web: Refactoring asyn/promise calls
|
2021-11-03 18:35:15 +03:00 |
|
|
|
3ebff769b1
|
Web: Login: Fixed login function for desktop client
|
2021-11-03 12:19:28 +03:00 |
|
|
|
eb1db9eea6
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 18:15:53 +03:00 |
|
|
|
dd89318a40
|
Web: People: Profile: Fixed serialized profile property
|
2021-11-02 18:12:15 +03:00 |
|
|
|
aa79ef2c9d
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 14:03:26 +03:00 |
|
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
|
3c25ee55b3
|
Auth: temp fix for plugin
|
2021-10-28 20:14:20 +03:00 |
|
Artem Tarasov
|
8c6a3f9fcd
|
Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage
|
2021-10-28 13:32:23 +03:00 |
|
|
|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +03:00 |
|
|
|
c0ea857dbf
|
Merge pull request #435 from ONLYOFFICE/bugfix/Bug-53050
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after l…
|
2021-10-27 18:54:08 +03:00 |
|
