Commit Graph

8589 Commits

Author SHA1 Message Date
Viktor Fomin
a591a48e13 Web: Common: create tree folder loader 2020-11-03 23:00:43 +03:00
Viktor Fomin
234b323633 Web: Common: fix coordinate x 2020-11-03 22:59:36 +03:00
5a959892ae
Merge pull request #114 from ONLYOFFICE/feature/connect-controlPanel
Feature/connect control panel
2020-11-03 21:14:44 +03:00
Viktor Fomin
c58a22748c Web: Common: Create circle loader 2020-11-03 20:22:32 +03:00
Viktor Fomin
f02e32894b Web: Common: added rectangle loader 2020-11-03 18:37:08 +03:00
Viktor Fomin
91c254c638 Web: Common: fix main button loader 2020-11-03 18:36:19 +03:00
Viktor Fomin
e99cdff1ad Web: Common: fix column size 2020-11-03 18:35:44 +03:00
Viktor Fomin
e9d3fe1775 Web: Common: added props for rectangle loader 2020-11-03 18:34:39 +03:00
Viktor Fomin
6ffd937480 Web: Common: fix loader style constant 2020-11-03 18:33:32 +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
Artem Tarasov
c09df3bec8 Web: Components: tree-menu: fixed draggable 2020-11-03 17:35:56 +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
Artem Tarasov
75939cffad Web: Files/Components: fixed group-menu-button in Header 2020-11-03 16:58:02 +03:00
790d2fc934 Restore: fix 2020-11-03 16:02:54 +03:00
Viktor Fomin
8ec67a1c03 Web: Common: Create FilterLoader stories 2020-11-03 15:56:33 +03:00
Viktor Fomin
f1d5b08521 Web: Common: Fix filter loader 2020-11-03 15:55:51 +03:00
Viktor Fomin
1e4558a646 Web: Common: Create rectangle loader 2020-11-03 15:55:14 +03:00
Viktor Fomin
354fbe6038 Web: Common: added loader style constant 2020-11-03 15:54: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
Artem Tarasov
e880ba8ba9 Web: Files: fixed position of contextButton in row 2020-11-03 15:14:13 +03:00
Artem Tarasov
8507650485 Web: Common: PageLayout: fixed selection items 2020-11-03 12:23:46 +03:00
8eeb2b3375 Nginx: fix files/thirdparty/capabilities 2020-11-03 12:23:17 +03:00
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +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
Artem Tarasov
920bd224cf Web: Components: tree-node: fixed selection 2020-11-03 10:01:01 +03:00
60e66c1abe Web: Fixed PWA App icon url on iOS 2020-11-02 21:42:53 +03:00
Artem Tarasov
2c6b10a58b Web: Files: Settings: fixed selection in the TreeSettings when switching from files 2020-11-02 21:17:28 +03:00
Artem Tarasov
bfcc46a546 Web: Files: Settings: fixed render MainButton 2020-11-02 20:56:58 +03:00
Artem Tarasov
fa1c8c8e37 Web: Files: selectors: added selector for icon of dragged file 2020-11-02 20:31:17 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
Artem Tarasov
f3231bd842 Web: Files: tooltip: refactoring tooltip when dragging' 2020-11-02 14:49:40 +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
Artem Tarasov
5f6e0e60e8 Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2020-11-02 13:36:03 +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
Artem Tarasov
6d41b0e64b Web: Files: Home: wixed style of tooltip when dragging 2020-11-02 13:19:06 +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
Artem Tarasov
a3b2475405 Merge branch 'develop' into hotfix/documents-bugfix 2020-11-02 09:23:36 +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