Commit Graph

7675 Commits

Author SHA1 Message Date
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
Artem Tarasov
0836a55d68 Web: People: fixed redirect after editing user via direct link 2020-10-05 12:45:16 +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
Artem Tarasov
a92365df79 fixed filter setting after returning from user/group view/edit 2020-10-05 11:29:01 +03:00
Artem Tarasov
0cac098bdf Web: People: fixed updating list of users after creating user 2020-10-05 10:50:50 +03:00
e7ce78e4c9
Merge pull request #89 from ONLYOFFICE/feature/fix-profile-info
Web: Added mapDispatchToProps at ProfileInfo
2020-10-05 10:12:57 +03:00
TatianaLopaeva
37e195ba53 Web: Re-wrote condition if the nameSchemaId is not set 2020-10-05 09:48:11 +03:00
Artem Tarasov
b82b55217b Web: People: fixed inability to close the modal window for adding an avatar when creating a user 2020-10-05 09:35:50 +03:00
Artem Tarasov
7dcc96b716 Web: People: added update state.people.users after update profile 2020-10-02 22:57:41 +03:00
3947b45177 Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-02 18:36:11 +03:00
9d32d7629a Web: People: Re-written Home/Header with selectors and reselect + refactoring 2020-10-02 18:34:50 +03:00
Ilya Oleshko
80066c1877 Web: Files : Home : Fixed mapStateToProps with new selectors 2020-10-02 17:36:47 +03:00
Ilya Oleshko
adfb3ccc4f Web: Files : Home : Fixed simple selectors 2020-10-02 17:35:57 +03:00
58f4f6b912 Notify: fix AutoSubmitted 2020-10-02 16:52:48 +03:00
Ilya Oleshko
70fb72e628 Web: Files : Home : Added simple selectors, fixed mapStateToProps 2020-10-02 16:21:36 +03:00
TatianaLopaeva
7bbc5bb693 Web: Added mapDispatchToProps at ProfileInfo 2020-10-02 15:47:13 +03:00
7bbba5f158 Web: People: Re-written Home/Body with selectors and reselect + refactoring 2020-10-01 22:01:52 +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
c008acee57 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
2020-10-01 17:32:12 +03:00
b5d6f589c8 fix Migration 2020-10-01 13:17:00 +03:00
e936ab4fc0 web: common: bump version 2020-10-01 13:16:53 +03:00
3b2648b18c Web: Common: fixed main wrapper height 2020-10-01 13:16:31 +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
90246bb616
Merge pull request #84 from ONLYOFFICE/featrure/fixe-switching-language
Featrure/fixe switching language
2020-10-01 10:51:45 +03:00
1b15795d7a Web: Files: fixed fetchFiles action, refactoring 2020-10-01 10:41:00 +03:00
Artem Tarasov
db7ac80645 refactoring getPortalSettings 2020-10-01 09:56:22 +03:00
TatianaLopaeva
01423d1159 Merge branch 'feature/files' into featrure/fixe-switching-language 2020-10-01 09:38:28 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
TatianaLopaeva
2261880855 Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function 2020-10-01 09:08:25 +03:00
TatianaLopaeva
2c1adaadde web: common: bump version 2020-10-01 09:04:56 +03:00
TatianaLopaeva
015b985755 web: common: bump version 2020-10-01 09:01:15 +03:00
TatianaLopaeva
82fac1f54d Deleted unnecessary constant 2020-10-01 08:58:17 +03:00
TatianaLopaeva
6cfdee13b0 Added language into array of useEffect 2020-10-01 08:55:59 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +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
2f1d43df7b Merge branch 'feature/files' into feature/loading-acceleration 2020-09-30 21:11:08 +03:00
140d57d5d4 Merge branch 'master' into feature/files 2020-09-30 18:28:27 +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