Commit Graph

8413 Commits

Author SHA1 Message Date
e9b5992600 Fix PrivacyRoomController 2020-11-05 18:42:23 +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
abc89c0e11
Merge branch 'develop' into feature/filter-loader 2020-11-05 18:12:32 +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
Viktor Fomin
151dc898f5 Update yarn.lock files 2020-11-05 12:28:39 +03:00
Viktor Fomin
ed84e89b94 web: common: bump version 2020-11-05 12:24:33 +03:00
Viktor Fomin
71bf070324 Web: Client: fix loader 2020-11-05 12:24:15 +03:00
Viktor Fomin
63015ca2bd Web: Common: fix color 2020-11-05 12:23:50 +03:00
Viktor Fomin
e2a32c10d6 Web: Common: added one row 2020-11-05 11:16:55 +03:00
Viktor Fomin
3bdff517f9 Web: People: rename headers components 2020-11-05 11:16:33 +03:00
Viktor Fomin
081fe180bb Web: Files: rename headers components 2020-11-05 11:15:46 +03:00
Viktor Fomin
e4f6dd255e Web: Common: rename headers components 2020-11-05 11:15:15 +03:00
Viktor Fomin
1c2e8e5c67 Web: Common: create headline loader 2020-11-04 12:27:56 +03:00
Viktor Fomin
37fc3fff7c Web: Common: added x, y props 2020-11-04 12:24:52 +03:00
Viktor Fomin
72467a70c2 Web: People: fix header loader 2020-11-04 12:24:02 +03:00
Viktor Fomin
1fc0d91182 Web: Files: fix header loader 2020-11-04 12:23:35 +03:00
Viktor Fomin
46a9fe2e45 Web: Common: Create head loader 2020-11-04 12:21:13 +03:00
Viktor Fomin
0efd774bba Web: Common: Create rows loader 2020-11-04 01:54:44 +03:00
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
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
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
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
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