|
|
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 |
|
|
|
dc7b2675f3
|
Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders
|
2021-12-23 16:29:21 +03:00 |
|
|
|
57d1d50f57
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-23 14:02:16 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b63d7d02f4
|
Web:Tests: close process when tests done
|
2021-12-22 18:45:53 +08:00 |
|
|
|
868332bb83
|
Web:Tests: add ability to ignore different cultures
|
2021-12-22 16:46:45 +08:00 |
|
|
|
15f412e1a8
|
Web:Files:Tests: update codecept config
|
2021-12-21 18:24:28 +08:00 |
|
|
|
ff7b6fc432
|
Web: init e2e tests
|
2021-12-21 15:59:11 +08:00 |
|
|
|
656fa2df89
|
edit translations
|
2021-12-17 10:14:40 +03:00 |
|
|
|
fb3bfba1bd
|
Files: optimization
|
2021-12-16 15:49:35 +03:00 |
|
|
|
a62fe009df
|
edit vi
|
2021-12-16 15:30:20 +03:00 |
|
|
|
780df07ae3
|
Web: Files: EmptyContainer: Added create form template button at empty root folder screen
|
2021-12-15 23:19:49 +03:00 |
|
|
|
28bc76b396
|
Web: Files: Delete translation key CreateWithEmptyTitle
|
2021-12-15 23:03:28 +03:00 |
|
|
|
6d84bd5f04
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-15 17:22:17 +03:00 |
|
|
|
f0f5246dad
|
Web: Files: Delete translation key CreateWithEmptyTitle
|
2021-12-15 17:02:42 +03:00 |
|
|
|
8e6d87b9c8
|
Web: Files: HOC: Fixed bug, empty file / folder name field cancels its creation
|
2021-12-15 17:02:01 +03:00 |
|
|
|
daec1f5294
|
Fixed Bug 51806 - Client.Files. Fixed error after clicking on the lock icon
|
2021-12-15 13:32:21 +03:00 |
|
|
|
8e97763dd9
|
edit Home.json
|
2021-12-14 13:31:16 +03:00 |
|
Maria-Sukhova
|
2ecc3b01ea
|
Update Home.json
|
2021-12-14 13:24:33 +03:00 |
|
|
|
49f3955e07
|
edit translations
|
2021-12-14 13:17:23 +03:00 |
|
|
|
4eee5b49a2
|
add lo
|
2021-12-13 14:55:33 +03:00 |
|
|
|
65a7ae3df4
|
add translations el
|
2021-12-13 12:26:37 +03:00 |
|
|
|
a62a555217
|
Files: tagDao. Precompiled queries
|
2021-12-10 17:04:33 +03:00 |
|
|
|
30c138ef8b
|
Files: optimization configuration
|
2021-12-10 17:02:44 +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 |
|
|
|
fce12af277
|
add translations
|
2021-12-10 13:34:21 +03:00 |
|
|
|
6e6a12fc95
|
Merge branch 'release/v1.1.0' into feature/editor-history
|
2021-12-10 10:00:15 +03:00 |
|
|
|
c3e440ee9c
|
Web: Files: Added reset of fields after creating a template from the current file.
|
2021-12-10 09:58:04 +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 |
|
|
|
5a8c60edf8
|
edit vi
|
2021-12-09 14:27:19 +03:00 |
|
|
|
372ba52d94
|
add translations
|
2021-12-09 14:07:51 +03:00 |
|
|
|
e8af856c26
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-09 13:55:55 +03:00 |
|
|
|
7c15232f71
|
Web: Locales: Changed translation "New master form" to "New form template"
|
2021-12-09 13:54:56 +03:00 |
|
|
|
86cd5e21e9
|
Server: Files: Configuration: Added ImageDark property for editors config, if we open filling form in dark mode
|
2021-12-09 13:39:03 +03:00 |
|
|
|
41681d0c94
|
Server: Files: Configuration: Fixed logo type for filling form mode
|
2021-12-09 12:45:52 +03:00 |
|
|
|
1b289515be
|
Files: rename master form to form template
|
2021-12-08 17:00:04 +03:00 |
|
|
|
73527a51dc
|
add translations
|
2021-12-08 15:58:10 +03:00 |
|
|
|
466f46958d
|
edit translations
|
2021-12-08 15:42:22 +03:00 |
|
|
|
feb48c01a0
|
Files: moved from feature/editor-version-history
|
2021-12-08 15:25:39 +03:00 |
|
|
|
225f277976
|
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-08 15:24:13 +03:00 |
|
|
|
4009717f96
|
edit lo
|
2021-12-08 15:23:44 +03:00 |
|
|
|
674732ee60
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-08 15:22:53 +03:00 |
|
