Commit Graph

7516 Commits

Author SHA1 Message Date
af756a1e76 Web: Fixed opening @self profile view 2020-10-06 11:33:53 +03:00
8f086d1183 Web: Fixed NavMenu crash on currentProduct equals null 2020-10-06 10:10:42 +03:00
c5f87f8200 Web: People: Fixed refresh page with Filter 2020-10-05 21:41:04 +03:00
8d7cf4f2dc Web: Replaced getCurrentModule with getCurrentProduct selector 2020-10-05 20:56:36 +03:00
c336279bf1 Web: Files: Fixed IsAdmin issues 2020-10-05 20:38:45 +03:00
5a4e8027a4 Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration 2020-10-05 18:25:36 +03:00
b741d9c7d7 Web: Components: Remove debugger 2020-10-05 18:25:24 +03:00
a6bc650da6 Web: Common: NavMenu refactoring 2020-10-05 18:25:01 +03:00
bf20339e47 Web: Files: fixed upload folder 2020-10-05 17:17:08 +03:00
0add76cd16 Web: Components: Added fix of error displaying 2020-10-05 16:09:35 +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
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
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
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
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
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
Artem Tarasov
053b3c902c refactoring getPortalSettings 2020-10-01 11:42:59 +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