Commit Graph

5778 Commits

Author SHA1 Message Date
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +03:00
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
28b274391a
Merge pull request #76 from ONLYOFFICE/feature/10.5.2-saas
Feature/10.5.2 saas
2020-09-11 17:22:45 +03:00
7c9df6c3c4 Moved from v10.5.2-saas 2020-09-11 17:16:59 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
c2d1df3fc3 Files: fix create first document 2020-09-10 21:34:23 +03:00
3a85553504 Files: GetFolderUrl fix 2020-09-10 17:09:27 +03:00
2413e22323 Files: GetFolderUrl fix 2020-09-10 16:31:32 +03:00
0a6c2fda18 Files: fix FileConverterQueueScope 2020-09-10 13:44:38 +03:00
f89af33b5b fix unhandled exception 2020-09-10 13:39:26 +03:00
fb0dec0a16 Files: fix 2020-09-10 12:30:33 +03:00
3f37da9891 fix notify 2020-09-10 12:02:26 +03:00
6887206670
Merge pull request #74 from ONLYOFFICE/feature/scope
Feature/scope
2020-09-09 21:28:49 +03:00
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
SuhorukovAnton
5f62bfb00d scope: bugfix 2020-09-09 17:02:51 +03:00
a53cdc568d Consumers: fix 2020-09-09 15:08:28 +03:00
a70b890581 Notify: rename 2020-09-09 13:43:39 +03:00
89860a2c2d
Merge pull request #75 from ONLYOFFICE/feature/default-value-module
Feature/default value module
2020-09-09 13:43:03 +03:00
SuhorukovAnton
88646b2d2f default-value-module: fix 2020-09-09 13:38:43 +03:00
SuhorukovAnton
3875f9f4b0 default-value-module: fix 2020-09-09 13:36:53 +03:00
SuhorukovAnton
2378c3746e default-value-module: fix 2020-09-09 13:25:50 +03:00
SuhorukovAnton
0f7901628b default-value-module: fix 2020-09-09 13:25:13 +03:00
SuhorukovAnton
ce27032fbb default-value-module: first version 2020-09-09 12:31:57 +03:00
c87fd2cfdb Files: share fix 2020-09-08 17:36:22 +03:00
ad51a6bf29 Files: fix 2020-09-08 17:00:29 +03:00
92a72d7983 Files: Tag. Fix 2020-09-08 16:33:39 +03:00
f8b3382a42 Files: tagDao. Fix 2020-09-08 16:22:45 +03:00
187e5de648 TagDao: fix 2020-09-08 16:10:18 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +03:00
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
6d567c4360 Merge branch 'master' into feature/scope 2020-09-04 14:45:50 +03:00
66009ff013 Jenkins: fix 2020-09-04 14:44:58 +03:00
020ccfd7d4 Scope: fix 2020-09-04 14:33:44 +03:00
8e3e73c746 Scope: fix 2020-09-04 13:10:19 +03:00
dc98b02d4f fix 2020-09-04 12:20:12 +03:00
897f3c910e Sln: removed *_Ubuntu configuration 2020-09-04 12:06:30 +03:00
f48574a809 Merge branch 'master' into feature/scope 2020-09-04 11:26:03 +03:00
e6f9e88bb8 new jenkins server 2020-09-03 18:49:43 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
5271c7f2f5 Api: fix error response 2020-09-03 12:38:13 +03:00
0f4877b541 AuthService: selectel instruction fix 2020-09-03 12:12:03 +03:00
4fc7427aed AuthService: added description 2020-09-03 11:43:13 +03:00
f5348c3ccd Files: settings. Added settings, forcesave, thirdparty 2020-08-31 15:41:28 +03:00
SuhorukovAnton
32f570784b scope: fix 2020-08-31 12:01:23 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
b5fcca25e0
Merge pull request #71 from ONLYOFFICE/feature/data-storage-migration
Feature/data storage migration
2020-08-28 19:02:44 +03:00