Commit Graph

5889 Commits

Author SHA1 Message Date
a3f36c2796 Nginx: fix 2020-10-12 12:22:23 +03:00
344acefa9b Files: fix filter 2020-10-12 11:26:15 +03:00
bd822fedd0 ds-vpath rewrite 2020-10-09 22:40:06 +03:00
9c7e979494 Config: internal path 2020-10-09 20:59:56 +03:00
26ac508aef Config: internal path 2020-10-09 20:41:26 +03:00
4759f8c90b Config: internal path 2020-10-09 20:26:25 +03:00
43a085eb18
Merge pull request #88 from ONLYOFFICE/feature/schema
Feature/schema
2020-10-08 13:51:06 +03:00
42e723ea49 Kafka: fix 2020-10-08 12:15:16 +03:00
bc1438ba92 EF: rename 2020-10-08 12:07:05 +03:00
b9e74c0e4d DbContextManager: fix 2020-10-08 11:56:46 +03:00
573dc8922b Merge branch 'master' into feature/schema
# Conflicts:
#	common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
e8061d10bd DI: refactoring 2020-10-08 11:36:47 +03:00
41eaf5d885 Files: api. AddToRecent 2020-10-07 17:31:17 +03:00
37d36ce86c Supervisor: fix backup 2020-10-07 16:10:20 +03:00
Diana
2ceb82b458 flag to turn on/off migrations 2020-10-07 15:20:06 +03:00
08590b6b58 Fix confirm 2020-10-07 13:45:53 +03:00
0a7eb28989 Reassign: fix scope 2020-10-07 11:23:43 +03:00
Diana
5c2b6debac fix migrations 2020-10-06 14:39:44 +03:00
Diana
cc8b3e470d fix 2020-10-06 14:38:15 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
191b517a59 Ef: fix 2020-10-05 13:11:15 +03:00
9c6812a9c3 EF: refactoring 2020-10-05 13:02:28 +03:00
bfba82be8e EF: refactoring data 2020-10-05 12:56:07 +03:00
9b5f32be30 Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema 2020-10-05 12:27:33 +03:00
07263e58e8 EF: removed partial
Files: removed DbEncryptedData.cs
2020-10-05 12:27:15 +03:00
58f4f6b912 Notify: fix AutoSubmitted 2020-10-02 16:52:48 +03:00
Diana
04ee542f22 fix migrations, models, added migration and model schema TelegramDbContext 2020-10-01 20:08:55 +03:00
3f7a42acc1
Merge pull request #85 from ONLYOFFICE/feature/hash-password
Feature/hash password
2020-10-01 19:29:25 +03:00
Artem Tarasov
b4c144df74 Web: Common: refactoring createPasswordHash 2020-10-01 19:04:10 +03:00
b5d6f589c8 fix Migration 2020-10-01 13:17:00 +03:00
6bad98e277 Merge branch 'master' into feature/schema
# Conflicts:
#	config/appsettings.json
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
Artem Tarasov
053b3c902c refactoring getPortalSettings 2020-10-01 11:42:59 +03:00
0bd5099c00 Removed Migrations() 2020-10-01 11:39:21 +03:00
Artem Tarasov
afedcc603c Web: Client: wizard: deleted unused props 2020-10-01 11:06:48 +03:00
Artem Tarasov
db7ac80645 refactoring getPortalSettings 2020-10-01 09:56:22 +03:00
Artem Tarasov
45e70f6d11 fixed missing hashSettings after logout 2020-10-01 00:46:33 +03:00
Artem Tarasov
17d999f538 refactoring 2020-10-01 00:44:49 +03:00
Artem Tarasov
f7064f3baa Web: Common: login: added hashPassword 2020-09-30 21:20:51 +03:00
Artem Tarasov
8db1420cdd Merge branch 'master' into feature/hash-password 2020-09-30 17:24:51 +03:00
58126fd98d Auth by passwordHash 2020-09-30 17:16:48 +03:00
Artem Tarasov
c81fe43538 Merge branch 'master' into feature/hash-password 2020-09-30 16:54:02 +03:00
c08abfc396 User: fix SetUserPasswordHash 2020-09-30 15:54:36 +03:00
Artem Tarasov
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Artem Tarasov
ceaca220db Merge branch 'master' into feature/new-authorization 2020-09-30 14:24:42 +03:00
Artem Tarasov
bfdfcbb4b5 Web: Client: Wizard: added password hash 2020-09-30 14:22:14 +03:00
bfd450e602 DbUserService: fix 2020-09-30 14:20:54 +03:00
Artem Tarasov
235193fb6b web: common: bump version 2020-09-30 11:45:47 +03:00
Artem Tarasov
b7cda3333e Web: Common: added function createHashPassword 2020-09-30 11:43:19 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
Artem Tarasov
5b5018a214 web: common: bump version 2020-09-30 10:44:06 +03:00