Commit Graph

8264 Commits

Author SHA1 Message Date
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
78b2dc4631 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-11-03 11:47:16 +03:00
f39d6e83b8 Files: refactoring 2020-11-03 11:47:05 +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
b0b4f91eac CustomNamingPeople: fix 2020-11-02 13:35:08 +03:00
10d21caf30
Merge pull request #116 from ONLYOFFICE/bugfix/nginx-config
Bugfix/nginx config
2020-11-02 13:32:16 +03:00
3075fc59d3 Merge branch 'develop' into bugfix/nginx-config 2020-11-02 13:22:18 +03:00
d1d01254a8 nginx: fix 2020-11-02 12:18:14 +03:00
203f32951f
Merge pull request #115 from ONLYOFFICE/feature/article-resize
Feature/article resize
2020-11-02 12:03:50 +03:00
42b7b93832
Merge branch 'develop' into feature/article-resize 2020-11-02 11:44:08 +03:00
2ae201ebbd Files: privacy 2020-11-02 11:29:01 +03:00
SuhorukovAnton
08a25a903e Merge branch 'develop' into bugfix/nginx-config 2020-11-02 11:17:31 +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
6baeee6ddd Files: fix startediting 2020-10-31 18:14:37 +03:00
e01182be70 Added /api/2.0/capabilities.json 2020-10-31 17:11:45 +03:00
1278b2abb5 Notify: fix 2020-10-30 20:51:01 +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
a823763af7 Web: Files : Body : RowContent : Fixed badges actions and styles 2020-10-30 15:20:06 +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
b1b402768b Web: Files : Body : Added context to RowContainer 2020-10-30 14:25:04 +03:00
Ilya Oleshko
797afe5c72 Web: Common: changed ReactResizeDetector refreshRate 2020-10-30 14:24:24 +03:00
Ilya Oleshko
318202ca57 Web: People : UserContent : Added sectionWidth property, fixed missing styles 2020-10-30 14:23:56 +03:00
Ilya Oleshko
b055c0224a Web: People : Body : Added context to RowContainer 2020-10-30 14:23:23 +03:00
Ilya Oleshko
648427fbf4 Web: People : Header : Added context to Header 2020-10-30 14:22:48 +03:00
Ilya Oleshko
3b9679957e Web: Files : Header : Added context to Header 2020-10-30 14:22:30 +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
Ilya Oleshko
c28b1d0121 Web: Components : RowContent : Renamed width property, fixed usage 2020-10-30 14:19:59 +03:00
f5ae1c4b0e Web: Files: fixed setIsLoading 2020-10-30 14:13:54 +03:00
SuhorukovAnton
a9b3fcd45b nginx-config: update 2020-10-30 13:04:29 +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
496d908f6d Notify: fix 2020-10-30 10:23:35 +03:00
5e90151e71 Notify: fix 2020-10-29 22:15:36 +03:00
0c1560a448 ResManager: fix 2020-10-29 22:15:14 +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