Artem Tarasov
|
09a91ba47f
|
Web: People: refactoring LeaveFormDialog
|
2020-10-05 17:11:58 +03:00 |
|
Artem Tarasov
|
c44543e177
|
Web: People: deleted unusing variables
|
2020-10-05 17:10:28 +03:00 |
|
TatianaLopaeva
|
b3d82c1e25
|
Changed font-style and font-weight for EmptyScreenContainer
|
2020-10-05 16:20:33 +03:00 |
|
|
|
0add76cd16
|
Web: Components: Added fix of error displaying
|
2020-10-05 16:09:35 +03:00 |
|
Alexey Kostenko
|
e6572e9574
|
Web: People/Components: Style fix, added translate keys
|
2020-10-05 15:39:55 +03:00 |
|
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
Artem Tarasov
|
5159b5c5b1
|
Web: People: added component LeaveFormDialog
|
2020-10-05 15:01:10 +03:00 |
|
Ilya Oleshko
|
df7a8c6515
|
Web: People: Home : Fixed status display
|
2020-10-05 14:59:42 +03:00 |
|
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
|
|
3de5601671
|
web: common: bump version
|
2020-10-05 14:28:41 +03:00 |
|
|
|
4629dfd077
|
web: components: bump version
|
2020-10-05 14:28:30 +03:00 |
|
|
|
8e0dc5dda4
|
Web: Client: Fixed merge error
|
2020-10-05 14:26:31 +03:00 |
|
|
|
53365f4c27
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-05 14:01:39 +03:00 |
|
|
|
9269465e59
|
Web: Files: moved upload to actions
|
2020-10-05 14:01:32 +03:00 |
|
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Artem Tarasov
|
0a248e6f3b
|
Web: People: fixed updating avatar in user list after creating new user
|
2020-10-05 13:29:14 +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 |
|
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 |
|
Alexey Kostenko
|
f481376a08
|
web: components: bump version
|
2020-10-04 14:41:51 +03:00 |
|
Alexey Kostenko
|
98d006d825
|
Web: Components: Fix mobile styles on AvatarEditor
|
2020-10-04 14:41:39 +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 |
|
Alexey Kostenko
|
18f504aaa4
|
web: components: bump version
|
2020-10-02 10:10:47 +03:00 |
|
Alexey Kostenko
|
19a7d88fe1
|
Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page
|
2020-10-02 10:10:40 +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 |
|
