Commit Graph

5439 Commits

Author SHA1 Message Date
TatianaLopaeva
326d2e50a9 Web: Common: Changed height and deleted position fixed for article 2020-11-10 10:52:06 +03:00
TatianaLopaeva
e65c62a282 Web: Common: Added margin-top 2020-11-09 20:57:13 +03:00
TatianaLopaeva
5eca305fdc Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-09 20:53:25 +03:00
TatianaLopaeva
c458c2d4fd Web: Common: Changed styles by layout 2020-11-09 20:50:02 +03:00
Ilya Oleshko
3411513117 web: common: bump version 2020-11-09 18:31:13 +03:00
Ilya Oleshko
b16448bea3 Web: Common: Article: Fixed after merge 2020-11-09 18:30:57 +03:00
TatianaLopaeva
78113a8168 Web: Common: Changed styles by layout 2020-11-09 15:42:48 +03:00
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
TatianaLopaeva
9289acdb51 Web: Common: Fixed the problem with show header scrolling horizontally 2020-11-05 19:04:24 +03:00
TatianaLopaeva
3cdc31a39b Web: Common: Fixed width of section-body for tablet/mobile 2020-11-05 16:17:59 +03:00
TatianaLopaeva
160c5ced25 Web: Common: Added window width in comparison condition for people module 2020-11-05 11:40:42 +03:00
TatianaLopaeva
7e034e60de Web: Common: Added display condition for section-header when group button menu is visible 2020-11-05 10:39:53 +03:00
TatianaLopaeva
8f47fe938c Merge branch 'develop' into feature/fix-hide/show-header 2020-11-05 10:35:16 +03:00
8cfbf8cc7f Api: fix attachments 2020-11-03 18:16:23 +03:00
TatianaLopaeva
c36f79b526 web: Common: Added window width in comparison condition 2020-11-03 16:02:20 +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
TatianaLopaeva
e876d2939a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-02 16:41:52 +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
TatianaLopaeva
5c89eabc81 Web: Common/Components: Added Hide Header on Scroll Down & Show on Scroll Up 2020-11-02 11:55:59 +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
TatianaLopaeva
aca906db56 Web:Common: Refactoring 2020-10-29 13:23:21 +03:00
TatianaLopaeva
d7a8226671 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
2020-10-28 19:02:51 +03:00