2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
d7e3e71194
crm: removed DataContract attribute.
2021-05-31 19:37:00 +03:00
ccd30b7b90
crm: refactoring. used JsonPropertyName instead of DataMember
2021-05-31 19:14:59 +03:00
15fb1c9a68
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
2021-05-31 19:01:54 +03:00
2dd7044097
Jenkins: fix notify
2021-05-31 19:01:40 +03:00
b952ecb69f
Merge pull request #268 from ONLYOFFICE/feature/11.5.2
...
Feature/11.5.2
2021-05-31 18:40:19 +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
afeec1942f
Files: fixed news request
2021-05-31 15:46:02 +03:00
8d88dbae2c
Jenkins: fix test
2021-05-31 14:25:14 +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
1a6d18fcdc
Files: fixed start docs
2021-05-31 12:37:13 +03:00
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +03:00
c8c5b49d1c
Files: thumbnails. 2e37dcd0
2021-05-30 21:52:32 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# 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-05-29 21:57:42 +03:00
06e40a9459
Merge pull request #267 from ONLYOFFICE/hotfix/v0.1.10
...
Hotfix/v0.1.10
2021-05-29 21:43:11 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
4b48bb1b90
Web: Added version and bump script
2021-05-29 21:20:44 +03:00
440638a18d
Audit: fix request
2021-05-29 17:55:36 +03:00
a9a7c0a4b7
crm: refactoring
2021-05-28 20:20:12 +03:00
401c8ca2e2
crm: migrate from newtonsoft to system.text.json
2021-05-28 18:18:55 +03:00
d0bbcb8d5a
Files: moved from 08a01422
2021-05-28 11:22:35 +03:00
527a650601
WebStudio: resources
2021-05-27 21:30:15 +03:00
bda786f844
WebStudio: moved from 08a01422
2021-05-27 20:13:24 +03:00
3cb0ff476c
Files: resources
2021-05-26 17:23:48 +03:00
d8adef733c
ASC.Files: moved from 08a01422
2021-05-26 16:54:46 +03:00
f6fbe33814
Web.Core: moved from 08a01422
2021-05-24 20:41:31 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
c8e5c5a93c
crm: migrate from ProgressQueue to DistributedTaskQueue
2021-05-24 12:56:49 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
c1b7ea5a9a
Storage: moved from 08a01422
2021-05-21 16:26:42 +03:00
019af93d6d
Merge pull request #263 from ONLYOFFICE/feature/fixed-tree-menu-update
...
Feature/fixed tree menu update
2021-05-21 11:50:55 +03:00
d83498f603
Web: Files: fixed tree menu update
2021-05-21 11:32:22 +03:00
f586f4d428
Web: Files: fixed crash page if folder doesn't exist
2021-05-21 10:30:22 +03:00
1f299420a1
Web: Files: added update tree menu
2021-05-21 10:29:58 +03:00
cec5dd3330
Web: Files: refactoring
2021-05-21 10:26:18 +03:00
46bc181cd7
Merge pull request #262 from ONLYOFFICE/bugfix/context-actions
...
Bugfix/context actions
2021-05-20 18:32:06 +03:00
6163da17a6
Merge branch 'develop' into bugfix/context-actions
2021-05-20 18:16:48 +03:00
4e5bd47c26
Feature/rpm update ( #229 )
...
* Add a build and install new services
* Change the packaging for the new build script
* Correct the configuration
* Add a bug fix with a mysql password containing ';'
* Fix services crash error
* Fix incorrect value addition in mysql
* Fix a rabbitmq error on CentOS 8
* Fix creating an invalid mysql password
* Fix non-existent tables Tenants
* Add an update to 1click
* Code correction
* Add two new services
* Add the buildpath variable
* Code Optimization
* Renaming services and creating a variable for the app name
* Revert "Merge branch 'feature/rpm-update' of https://github.com/ONLYOFFICE/AppServer into feature/rpm-update"
This reverts commit 19c1eae6f6e3f22f4cbc0e3276fa892b0d9fa97a, reversing
changes made to fb36a996366291486e3b9f5a6f46398916ef8a6c.
* Code Optimization
* Code optimization
* Code optimization and creating a variables
2021-05-20 17:39:38 +03:00
354841442e
Web: Editor: Fixed shell name
2021-05-20 14:21:26 +03:00
3ace83bd61
Web: Files: fixed onFilesClick
2021-05-20 14:00:41 +03:00
ac976de0a5
Web: Files: fixed onFilesClick
2021-05-20 13:55:58 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00
93ba0e8eb8
Merge pull request #253 from ONLYOFFICE/feature/my-profile
...
Feature/my profile
2021-05-20 13:09:30 +03:00
28a5a3d7f2
Merge branch 'develop' into feature/my-profile
2021-05-20 12:43:16 +03:00
f5372bbba8
Web: People: MyProfile: Fix translations loading
2021-05-20 11:45:13 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
3b7f1f60ec
Web: Files: fixed loopTreeFolders
2021-05-20 11:17:50 +03:00
5de1182bfa
Web: Files: fixed NewFilesPanel error
2021-05-19 18:55:12 +03:00
