|
|
f340924612
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-18 20:19:56 +03:00 |
|
|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +03:00 |
|
|
|
b6b88b2506
|
bug fix: exception when call "getbackuphistory"
|
2021-06-17 16:48:20 +03:00 |
|
|
|
8fc9bef6c6
|
Core: fix cache
|
2021-06-16 22:25:02 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
c22c25e5bf
|
bug fix: DistributedTask.Exception clean up when OnCompleted
|
2021-06-16 17:24:48 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
73547f421e
|
Common: install newtonsoft
|
2021-06-15 16:44:53 +03:00 |
|
|
|
a66e3afa92
|
Web: Tests: Commented "Save empty 'EN' keys to not found files"
|
2021-06-11 18:18:38 +03:00 |
|
|
|
fc9d626bcc
|
UrlShortenerService: fix log
|
2021-06-11 11:44:10 +03:00 |
|
|
|
0663ed7f16
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2021-06-10 11:56:32 +03:00 |
|
|
|
8d80955686
|
Thumbnail: fix
|
2021-06-09 15:04:29 +03:00 |
|
|
|
6db87a3907
|
Backup: Fixed after merge.
|
2021-06-08 15:32:28 +03:00 |
|
|
|
3ef16948fc
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
|
2021-06-08 15:03:49 +03:00 |
|
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
|
54d5c658bd
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-07 11:54:06 +03:00 |
|
|
|
e8516f7b34
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-03 20:27:57 +03:00 |
|
|
|
944966b67b
|
WebSocker: repair service
|
2021-06-03 16:13:22 +03:00 |
|
|
|
43de25b62a
|
Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
|
2021-06-03 12:52:21 +03:00 |
|
|
|
bcc9e6c34b
|
ResManager: additional feature
|
2021-06-03 12:48:25 +03:00 |
|
|
|
ceb19659f3
|
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
Feature/thirdparty for two frameworks
|
2021-06-03 12:19:27 +03:00 |
|
|
|
c6f85ef4ce
|
Merge branch 'develop' into feature/two-factor-auth
|
2021-06-02 23:57:00 +03:00 |
|
|
|
3635905167
|
Backup: fixed link
|
2021-06-02 17:02:19 +03:00 |
|
|
|
d134398167
|
Storage: fix resolve
|
2021-06-02 16:28:05 +03:00 |
|
|
|
d741e91e96
|
Backup: fixed notify
|
2021-06-02 15:00:36 +03:00 |
|
|
|
0aa6a71ea8
|
Merge branch 'develop' into feature/translations
|
2021-06-02 14:05:43 +03:00 |
|
|
|
36bc5a4172
|
Backup: fix
|
2021-06-02 12:58:46 +03:00 |
|
|
|
e9c5ca41ae
|
fix
|
2021-06-02 11:26:58 +03:00 |
|
|
|
95dbfb8c5c
|
Merge branch 'develop' into feature/translations
|
2021-06-01 20:02:48 +03:00 |
|
|
|
72f27e9b55
|
Web: Tests: Added new NotTranslatedToastsTest()
|
2021-06-01 20:00:36 +03:00 |
|
SuhorukovAnton
|
7fd550dfe8
|
Merge branch 'develop' into feature/thirdparty_for_two_frameworks
|
2021-06-01 17:49:10 +03:00 |
|
|
|
3ca36c9dd2
|
Web: Tests: Added new Common translations;
|
2021-06-01 17:00:55 +03:00 |
|
|
|
23e1083be7
|
Web: Removed empty translations keys
|
2021-06-01 13:49:37 +03:00 |
|
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
|
424ea1396b
|
Web: Tests: Added opportunity to apply new Common translations
|
2021-06-01 11:44:46 +03:00 |
|
|
|
353fda6ff8
|
Web: Tests: Added opportunity to apply new translations
|
2021-06-01 11:29:46 +03:00 |
|
|
|
a7befed9be
|
Web: Tests: Refactoring
|
2021-05-31 21:01:47 +03:00 |
|
|
|
f9f049bb80
|
Web: Tests: Added new EmptyValueKeysTest()
|
2021-05-31 20:53:26 +03:00 |
|
|
|
7beccd192b
|
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
|
2021-05-31 20:33:12 +03:00 |
|
|
|
2018820472
|
Merge branch 'develop' into feature/crm-migrate
|
2021-05-31 19:37:51 +03:00 |
|
|
|
061b4e46e7
|
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
|
2021-05-31 19:11:58 +03:00 |
|
|
|
e2b9561d7b
|
Web: Rewritten all json translation files with sorting of properties alphabetically
|
2021-05-31 18:34:15 +03:00 |
|
|
|
4cabbb7d52
|
Merge branch 'develop' into feature/11.5.2
|
2021-05-31 18:13:08 +03:00 |
|
|
|
3e6cc50323
|
Api: error custom messages
|
2021-05-31 18:08:55 +03:00 |
|
|
|
d3fb9f8384
|
fix
|
2021-05-31 14:08:13 +03:00 |
|
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
|
0be4e07865
|
SsoAuth: 2e37dcd0
|
2021-05-31 11:35:42 +03:00 |
|
|
|
7026b19db0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
|
2021-05-31 09:23:53 +03:00 |
|
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
