Commit Graph

5883 Commits

Author SHA1 Message Date
SuhorukovAnton
7b1de6b36a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 17:14:48 +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
SuhorukovAnton
5aeaa0ee98 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 13:45:21 +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
ae61f59d55 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 12:40:01 +03:00
SuhorukovAnton
ce27032fbb default-value-module: first version 2020-09-09 12:31:57 +03:00
SuhorukovAnton
1752b9a4ba encryption: fix 2020-09-09 12:03:21 +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
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +03:00
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +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
Diana
32241a70a6 changed 2020-09-07 01:49:03 +03:00
Diana
463a73e22c changed 2020-09-06 21:47:52 +03:00
SuhorukovAnton
fc80c8e067 encryption: add bat 2020-09-05 23:08:00 +03:00
SuhorukovAnton
89318a1f37 encryption: fix 2020-09-05 23:02:51 +03:00
Diana
23a832b834 changes 2020-09-05 22:19:25 +03:00
Diana
9f1cf2f8df changes 2020-09-05 22:18:29 +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
SuhorukovAnton
3e3257b4be encryption: fix 2020-09-04 11:22: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
SuhorukovAnton
d8576a4b0a encryption: fix 2020-09-03 14:48:36 +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
aa62721e73 EF: refactoring 2020-09-02 18:23:39 +03:00
SuhorukovAnton
15b17a0478 Encryption: first version 2020-09-02 13:54:50 +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