Commit Graph

5483 Commits

Author SHA1 Message Date
Vladislav Makhov
c9eeeed26e Add separator 2020-11-06 16:20:27 +03:00
Vladislav Makhov
25c812937d Rename sendConsumerNewProps to updateConsumerProps 2020-11-06 14:29:55 +03:00
Vladislav Makhov
462c7578fb Moved declaration out from render 2020-11-05 18:56:45 +03:00
Vladislav Makhov
b777439f09 Change to decomposed prop consumer 2020-11-05 18:43:21 +03:00
Vladislav Makhov
79d2940514 Rename prop NewProps to newProps 2020-11-05 18:41:01 +03:00
Vladislav Makhov
9220ab7d4f Fix name 2020-11-05 18:38:31 +03:00
Vladislav Makhov
fc534aca67 Fix name 2020-11-05 18:38:00 +03:00
Vladislav Makhov
2108c2fba9 Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports 2020-11-05 18:20:15 +03:00
Vladislav Makhov
baa90d1a84 remove console warnings 2020-11-05 18:17:10 +03:00
Vladislav Makhov
c483acfde3 this.state decompose 2020-11-05 18:14:59 +03:00
Vladislav Makhov
49acf0168c Moved declarations out from render 2020-11-05 18:11:32 +03:00
e22de56363
Merge branch 'develop' into feature/third-party-settings 2020-11-05 17:45:54 +03:00
8cfbf8cc7f Api: fix attachments 2020-11-03 18:16:23 +03:00
Vladislav Makhov
550d08dc51 Fix modal 2020-11-03 17:48:05 +03:00
Vladislav Makhov
22a494a5ad yarn.lock update 2020-11-03 17:39:49 +03:00
04003a0fa4 Web: Common: update lock file 2020-11-03 17:26:47 +03:00
7da4a806ff Web: Components: added new icons 2020-11-03 17:26:21 +03:00
Vladislav Makhov
1e483de4ba Merge branch 'develop' into feature/third-party-settings
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-11-02 13:56:52 +03:00
b0b4f91eac CustomNamingPeople: fix 2020-11-02 13:35:08 +03:00
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
52f1ea68a1 /api/2.0/authentication: application/x-www-form-urlencoded 2020-11-01 17:14:20 +03:00
ab8c6c6a81 Added · api/2.0/portal/mobile/registration 2020-11-01 14:58:43 +03:00
e01182be70 Added /api/2.0/capabilities.json 2020-10-31 17:11:45 +03:00
6cdab3daca Notify: fix 2020-10-30 18:42:56 +03:00
49dd924dc4 Notify: fix 2020-10-30 18:17:11 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
08b9db919e Merge branch 'feature/article-resize' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/article-resize 2020-10-30 17:23:06 +03:00
440395d341 Web: Common: fixed update main height timeout 2020-10-30 17:22:49 +03:00
Ilya Oleshko
7726e17170 Merge branch 'develop' into feature/article-resize 2020-10-30 15:32:25 +03:00
Ilya Oleshko
fa5cf43fa8 web: components: bump version 2020-10-30 14:25:33 +03:00
Ilya Oleshko
bf879ce810 web: common: bump version 2020-10-30 14:25:22 +03:00
Ilya Oleshko
797afe5c72 Web: Common: changed ReactResizeDetector refreshRate 2020-10-30 14:24:24 +03:00
Ilya Oleshko
c646f84383 Web: Components : GroupButtonsMenu : Added sectionWidth property 2020-10-30 14:21:56 +03:00
Ilya Oleshko
50983c5f0f Web: Components : Row : Renamed width property, fixed usage 2020-10-30 14:21:27 +03:00
Ilya Oleshko
7ed2d7a00c Web: Components : RowContent : Renamed width property 2020-10-30 14:20:55 +03:00
9d6e1f58ea Notify: fix 2020-10-30 12:49:37 +03:00
b594986270 Notify: fix password change 2020-10-30 12:19:14 +03:00
ea21d49ddc Web: Common: fixed main container height 2020-10-30 12:08:34 +03:00
5e90151e71 Notify: fix 2020-10-29 22:15:36 +03:00
ad23a67282 Notify: fix 2020-10-29 19:52:32 +03:00
06517ce41e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-10-29 19:30:17 +03:00
260f939d2c Notify: fix 2020-10-29 19:10:07 +03:00
13c690e183 Web: Common: fixed main container height 2020-10-29 18:18:00 +03:00
bc725f29df Web: Common: added re-resizable package, added new acticle 2020-10-29 17:33:05 +03:00
ebb6d92c49 Web: Components: added context 2020-10-29 17:29:22 +03:00
SuhorukovAnton
c94b0ee340 connect-controlPanel: fix branding, backup and restore 2020-10-28 16:21:24 +03:00