Commit Graph

2273 Commits

Author SHA1 Message Date
a26e475c94 Web: fix no license warning 2021-08-11 20:39:24 +03:00
3f56790c85 Fix bug 51365: update avatar in header 2021-08-11 10:18:10 +03:00
578ab81947 Web: People: fixed error with change avatar 2021-08-02 14:41:19 +03:00
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
1ebc588a93 Web: Bumped version to 1.0.0 2021-07-14 13:26:36 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
4cd1b3fa75 Web: People: Applied prettier style fix 2021-07-09 16:15:13 +03:00
e0b37cfd1b Fix Cancel click on edit profile on personal 2021-07-09 15:30:32 +03:00
a31dc583c1 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
2a44887b22 Web: hid temp loaders 2021-07-02 14:28:11 +03:00
45920f7535 Web: fixed MainButton loader 2021-07-02 14:05:38 +03:00
4f9e03212f Web: Files: added filter cleaning 2021-07-02 13:44:58 +03:00
513ec04e33 Merge branch 'develop' into feature/translations-loaders
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
b195036cd0 Web: People: added withLoader HOC to Section Header 2021-07-01 16:43:42 +03:00
abfcba8993 Web: People: added withLoader HOC to MainButton 2021-07-01 15:48:26 +03:00
2c1bdf086a Web: People: added loaders to people translations 2021-06-30 18:29:06 +03:00
69889cab4c Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/constants.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
d9eca86efa Web: People: added tReady to file dialogs 2021-06-30 14:11:52 +03:00
2cdcd36020 Web: Commented annoying logs 2021-06-22 13:43:18 +03:00
6118e95028 Merge branch 'develop' into feature/personal 2021-06-17 14:25:09 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
d44f1bee0f Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code 2021-06-11 16:57:17 +03:00
Artem Tarasov
1073da9d58 Web: deleted unnecessary code 2021-06-11 14:55:53 +03:00
Artem Tarasov
81b778765f Web: People: navigation profile fix 2021-06-11 14:04:26 +03:00
Artem Tarasov
74fba5c2de Web: People: fixed loading Profile, ProfileAction, fixed navigation between them 2021-06-11 13:25:09 +03:00
bac090e180 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
Artem Tarasov
3db9b30e5e Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
93ba9c5940 Web: People: change trans on t 2021-06-08 16:09:51 +03:00
18cdf1dc95 Web: People: fixed translations 2021-06-08 15:29:44 +03:00
Artem Tarasov
c25fa589a9 Web: People: deleted fonts with ext .woff, added hash to font name 2021-06-08 15:26:56 +03:00
65936fb856 Web: People: fixed translations 2021-06-08 15:25:26 +03:00
6a06707d18 Web: People: fixed translations 2021-06-08 15:19:49 +03:00
27e6226e66 Web: People: get backupCodes from tfa store 2021-06-08 14:19:55 +03:00
Artem Tarasov
67feed3cf9 Web: People: fix crash Profile 2021-06-08 14:01:19 +03:00
71564c7348 Web: People: deleted duplicate key 2021-06-08 13:35:31 +03:00
ffbbcc6ac2 Web: People: change trans on t 2021-06-08 13:34:41 +03:00
af6d7cd160 Web: People: fixed 2021-06-08 13:26:04 +03:00
Artem Tarasov
46a76abef3 Web: People: added withLoader to ProfileAction 2021-06-08 13:25:43 +03:00
Artem Tarasov
b32edbc3f5 Web: People: added wtihLoader to GroupAction header 2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9 Web: People: added withLoader to GroupAction 2021-06-08 13:01:16 +03:00
ffb5dace5d Web: People: fixed 2021-06-08 12:28:51 +03:00
Artem Tarasov
5dc279b5a9 Web: People: added withLoader to Profile 2021-06-08 12:28:19 +03:00