Commit Graph

2258 Commits

Author SHA1 Message Date
fa4f3d5d7b Web: Files: renamed setNewTreeFilesBadge action to setUpdateTree 2020-10-06 15:35:12 +03:00
5ae3b98548 Web: Files: fixed article body selectors, added redux to TreeFolders.js 2020-10-06 15:32:57 +03:00
Ilya Oleshko
2732f892da Web: Files : Home : Added events for rename and create, fixed loop folder data 2020-10-06 14:57:16 +03:00
Ilya Oleshko
a522433ed7 Web: Files : Home : Added selectors for fileRow 2020-10-06 14:56:31 +03:00
af756a1e76 Web: Fixed opening @self profile view 2020-10-06 11:33:53 +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
bf20339e47 Web: Files: fixed upload folder 2020-10-05 17:17:08 +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
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
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
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
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
1b15795d7a Web: Files: fixed fetchFiles action, refactoring 2020-10-01 10:41:00 +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
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
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
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Ilya Oleshko
a9163c06be Web: Files : Fixed open files after create 2020-09-30 11:57:22 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
4ac2767afb Web: Files: removed useless actions, fixed clearProgressData 2020-09-29 18:24:49 +03:00
4b302d1634 Web: People: Replaced RequestLoader to showLoader/hideLoader function calls 2020-09-29 17:43:13 +03:00
f96e5cee1a Web: Files: Replaced RequestLoader to showLoader/hideLoader function calls 2020-09-29 17:40:42 +03:00
80853762b1 Web: Files: Fixed mapDispatchToProps 2020-09-29 14:47:29 +03:00
86207e27fc Web: Applied prettier styled and removed debugger 2020-09-29 14:46:28 +03:00
981e7646ca Web: Files: Fixed opening DocEditor 2020-09-29 14:21:37 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
TatianaLopaeva
ea2f5ec097 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-29 09:06:16 +03:00
Ilya Oleshko
ac9262f4c9 Web: Files : Fixed editor url, always last 2020-09-28 17:46:27 +03:00
Ilya Oleshko
9933b768d0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 17:23:32 +03:00
Ilya Oleshko
e4764828f3 Web: Files: Editor : Fixed frame height for tablet 2020-09-28 17:23:11 +03:00
TatianaLopaeva
fbc9e7a354 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 16:22:49 +03:00
5ad8730c46 Web: People: Fixed open @self profile 2020-09-28 16:20:16 +03:00